Amps and pre amps to improve on VMPS RM40 system


I have VMPS RM 40 speakers with a wadia 21 cd player, Classe cav-150 multi channel power amp. Interconnects are Audio Magic and speaker cables are Home grown audio.
When I listen to music which represents just a vocal, or just 1 instrument the system sounds great. Once the music gets more complex i.e. classical symphony or full on Led Zeppelin, the sound just becomes a cacaphony. Messy, unclear, no separation left, harsh, metalic and unpleasant. I want to upgrade my system but don't know where to start. Should I get a pre amp (tube or ss) should I get a better power amp. I don't want to change the speakers nor the cd player. I am tempted to get a BAT VK30SE pre amp and Conrad Johnson 12 power amp. Anybody with any thoughts?
willems
I wonder if this is the CDs? My Led Zeppelin CDs are all horribly mastered, and much of the classical I have bought isn't that good either.

Do you currently have no pre-amp? If so, you could be seeing a mismatch between CD player and amp that would be helped by a preamp.
I know that Brian Cheney uses a Plinius Amp I am not sure which one. You could call him and find out what his recommendations are very customer friendly or head over to the audio circle website and check the VMPS threads http://www.audiocircle.com/circles/viewforum.php?f=39&sid=
or harmonic discord. Good Luck