Your room is the weakest link. You need room treatment. I'm using Primacoustic in my dedicated room. It has made more of a difference than any gear change ever could. The room and your ears are the most important parts of any system regardless of cost. Until you address the room seriously you will never be happy with the sound.
Tom
Tom