I settled on decidedly different HT and stereo (music only) systems. For HT, I removed the four Infinity P163's from the bookshelves and replaced them with four P363's, keeping the old Klipsch KV-2 CC and Polk PSW-505 sub. The CC wasn't right - I bought another P363 as CC on one side of the 55" monitor - my CFO said it looked unsymmetrical - another one on the opposite side would look better - and require removing the 'ugly black box', the Polk sub, so I got another P363. At $107 shipped, it was my most expensive one! The twelve 6.5" LF drivers put out enough bottom end effects for me (I still tend to duck when cannon balls whiz overhead in "Master and Commander" - and "Star Wars" never sounded so good!). Dialogue sounds spacious, too. I suppose it's a Surround 5.0* system, where the * means it has dual CC speakers - which don't sound as though the predicted interference is a problem!
For music, I have my office stereo: an Onkyo C-7030 driving a 50Wpc Emotiva A-100 BasX amp, which has a volume control and headphone jack and drives a pair of '77-vintage Klipsch Heresy's out from the 11ft wall's corners in my 11 ft x 12 ft x 9ft carpeted office. It's the best sounding stereo I've ever owned. I am listening to my over three decade old copy of Dire Straits' "Brothers in Arms" CD - and it sounds great - plenty of bottom end - great mids and top end - and dynamic range. The Heresy's are efficient - a 7W SET amp would drive them fine (I love my little Emotiva amps!). The same CD on my HT (Onkyo TX-SR505), set for stereo and played over a Sony BRD player can't compare!
I think that different missions do require optimized equipment! Further, you can get by for less if you demand audiophile quality equipment for your passion genres, be they music, HT, or, I suppose, both.