Need help upgrgading speakers and amp. Ideas?

Here's my dilemma: I have a relatively new system, but starting to get the upgrade fever, essentially because I'm not quite satisfied with the sound. It's not that the sound is bad. It does sound good, but not with all types of music. Jazz sounds great. Classic Rock, depends on the recording. I'm thinking of upgrading amp and speakers. My ideas on speakers are: Audio Physic Virgo III or Avantis, Monitor Audio GR 60, Joseph Audio RM 33si, Vienna Acoustics Mahler, Coincident Total Eclipse or the Thiel 2.4. I'd like to pair the speakers with either the Pass Labs X250, Plinius SA 250 Mk IV. Any other suggestions.
My current system:
Sunfire Series II Amp
Thiel Cs2 speakers
Cary SLP 88 Preamp
Music Hall 25 CD Player (modded by Parts Connection)
Audioquest sidewinder cables and type 6 speaker cable.
The above is set up in a 12 by 14 listening room.
Also, I'm upgrading to Simaudio Nova CD player, as I heard it recently and fell in love with the clarity and detail.
I appeal to the experienced audiogoners to help me navigate through these waters, so that I can put about 10 large of my bonus to good use.
nighteyes