I too suggest the M22ti. Though for a sub, I would suggest the Hsu VTF-3 (or VTF-2). The SVS subs are great, but in the two side-by-side comparisons I've read, the Hsu is a bit tighter - better for music. The SVS's give better boom for HT.

As far as the M22ti being irrating - I also agree, bad recording in = bad playback out. The M22's are a fantastic speaker. Very detailed, and clean, clean sounding. They aren't going to "soften" up any bad recordings. That's one of the biggest things I've noticed since I got mine. Before my M22's most cd's sounded the same. Now with the M22's, well recorded cd's really shine. Poorly recorded ones, stand out as being just that - poorly recorded.