I'm very similar- look into the Daily Mixes that are created, this solves that issue for me.

Right now I have six different mixes and each one of them seem to be a grouped into a different genre (or sub genre).