Youre thinking to much dont sub genre your genre sections. I keep mine simple:
Rock/Metal
Jazz
Classical
Country
R&B/Funk/Soul
Rap/Hip Hop
Pop/Dance/Electronic
Salsa
Christmas
And then all my japanese artists/bands are together subdivided into the Rock/Metal, Pop, and Jazz