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.
I have owned the Sonus Faber Grand Piano Home’s speakers and I feel that is your bottle neck. they are nice speakers but they don’t rock that well IMO.

I’ve been trying out some horn loaded speakers from Klipsch’s new heritage line and they give you the slam your looking for. also very efficient so you don’t need much power and will fill your room better then the Sonus Faber’s.

after that I’d ask what cart are you running on your planar 2?

after that I’d look at turntable upgrades maybe, I always found the Rega tables to lack a bit for rocking out.

I’m not that familiar with Mac gear so not sure if your using a DAC built in or not.

nice over all system though i bet you have good synergy with all the Mac gear that’s one of the hardest thing to find IMO.
Thanks all.  No room treatment as yet, and the cartridge with the Planar 2 is the Ortofon Red.   
Any suggestions for a turntable upgrade?  VPI?
Also, what do folks here think of the new Sonus Faber Olympica Novo speakers?  Or the Revel Performa line?  Should I even ask about B&W?