Help me upgrade my Mac system?!


Hey everyone,

I am looking to upgrade my system, but don’t quite know where to start. Here’s the system:

McIntosh C2600 hybrid tube preamp
McIntosh MC152 autoformer SS amp
McIntosh MCT500 CD transport
Rega Planar 2 turntable
Sonus Faber Grand Piano Home floorstander speakers
AudioArt cables

The setup sounds great for well recorded vocals and even dance music, but it does lack a certain presence and “punch”, and liveliness for rock and pop music. Bass extension and overall presence and slam are not quite there either. My room is large, 16x30 with 20 foot ceilings.
What would you upgrade first? I don’t yet really want to go up to a bigger (heavier) SS Mac amp (462, 312) to save my aging back and due to current space concerns. I had an MC275 tube amp which I loved but it ran too hot for the room, especially in summer. Also bass definition and power was a bit lacking. I’m definitely open to tubes but need guidance from the experts.
Help! I’m considering the new Sonus Faber Olympica Nova series, or perhaps Vandersteen or Revel Performa F228. Perhaps an Audio Research SE type tube amp?


scottlawhome
Don Sachs pre or linear tube audio pre sounds great with my friends Mac. better than the Mac pre he was using and by a considerable margin. 
80% of what I listen to is live rock and roll. It took me twenty five years to figure out that dual subs solved all my "wants" in enjoying the live recordings to their most realistic reproduction. I too have a large and somewhat "bright" sounding room, two subs in stereo is the lost key I had been seeking, I'll never go back.