Instead of dividing my classical genres by period (baroque, classical, etc.), I do it by the type of composition: Orchestral, Chamber, Choral, Instrumental.
I have a harder time with artist/album/track. Here is what I've come up with:
Artist = composer: "Beethoven"
Album = work + performance: "String Quartet 15 in A minor, op 132 (Quartetto Italiano)"
Track = number + movement: "1. Assai sostenuto - Allegro"
Not perfect, but it works for me.