I would also stick with 5.1 if it means compromising another piece of equipment. While 7.1 helps with some things I actually turn it off at times. Certain 5.1 video games like “Elder Scrolls: Oblivion” don’t pan smoothly across the back in my room when Dolby PLIIx is engaged.
Also I think that the M22 +sub is a fantastic choice especially if you can use the upgrade program should you prefer how your M60s sounded. I just recently added a pair of M22 to my system and think they are bang for your buck the best Axiom speaker I have, and I’m a happy M80 owner.
