I also listen to a wide variety of music, and what I've found works really well is letting playlists run past their end, into the recommended tracks at the bottom. Spotify's usually pretty good about keeping to that theme.