I too suggest the M22ti, and don't skimp on the sub. (I highly recommend the Hsu STF-2.)

The M3ti seems to be the speaker of choice for a smallish room and for two channel listening. The M22ti is by far the bookshelf speaker of choice for the combination of HT and music listening, in a small to medium sized room.