Boy, do I need help

You can see my system posted. I have struggled for over a year with really hard edges on certain piano pieces (actually two specifics) on two CD's and it just told me I had problems. I took the CD's in question to my dealer, who has the same CD player, albeit different system (Ayre MXR/KXR, Dyn C4-I know-no comparison to what I have, but the discs--and the player were fine. I did EVERYTHING (PC, IC, isolation, line conditioners, racks--you name it--) and finally figured out my Esoteric just didn't like my preamp. I just hooked up the CD player to my amp directly (it has a volume control and remote) and problem solved-pure bliss. Here is my problem - CD player now on the floor on a butcher block (on cerapucs) in the middle of the room (actually in front of the amps-worried about housekeeper vacuming)and instead of having my Acaconda PC into my hydra, its into my Richard Gray (and still sounds awesome but expect would sound better into hydra). And, to hear my other sources (which sound great through the preamp) I need to reconnect cables. Would you suggest geting another hydra (I can get away with a '4') and a new three shelf rack (for amps & CD player) (please see photos of room) or shop for another preamp? I respect alot of you guys here, and you have helped me tremendously over the years.

Thanks,