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?

If you like Mac gear then why start there...  We all know that your weakest link are your speakers.  It is known that Mac and Sonus go hand in hand, this is why they are paired quite a bit.  I say get the right speakers for your gear and save your money, unless you want to eliminate your Mac all together.  Speakers are the most important part of your gear, they are front and center.  As an example what is the most important piece to a home theatre “center channel” if your center is a piece of the rest does not matter.
I had my Grand Pianos paired with Krell but I still did not get the punch I wanted out of them.  Mac gear is warm and they do pair nicely with Sonus Faber.
If you are considering B&W you would have to spend a lot of money to get a good sound. In my opinion only, they are over rated. 

I also agree with glennewdick on the Klipsch Heritage line and yes the Revel would be another option. I actually like the Rockport’s over the Revel’s if that is the sound you are leaning towards.