Combining HT and Stereo only setup. Recos Please

Hi,

My present budget system is as follows :

Home theater :
Sony DVPC685V
Onkyo TX-SR 502
Hsu Research VT-12 6 channel surround system
Adire Rava Subwoofer
Acoustic Research cables all around

2 Channel setup in my bedroom :
Magnepan MMG
NAD C320BEE
Sony Walkman for the CD player
Nakamichi DR-10 Tape Deck
QED Interconnects and Home Depot HD-14 speaker cable.

I know that many audiophiles might faint seeing that I'm using a walkman and Home depot cables, but I'm okay with the setup. I largely listen to classical and classic rock. So my bedroom system works just fine. It could use more power though.

Now my problem is that I want to combine the two and have just one system. Having two systems is taking up too much real estate in my small apartment.

I've about $2k invested in the above. So i'm looking for something in this price range. I'd ,at minimum, like a 3.1 HT setup that can double up as a great 2 channel system.
If the fronts are towers that can go down to abt ~40Hz, then I can let go of the sub. Or else I'll keep it.

Though I love my maggies, I am ready to replace them with something else, as I see that they demand space and power. Both of which are currently in short supply.

Please suggest something that'll fit in my scheme of things.