The room you'll have this system in now is plenty big enough to enjoy the M60s or even the M80s. If getting the M80's means no sub, then I'd suggest you get the M60's and a good sub.

Here's my suggestion for your room now.

M60ti mains
VP150 center
QS8 surrounds
Hsu VTF-3 sub

I'd if buget is an issue, skip the 7.1 and stick with 5.1 for now. A subwoofer is FAR more important than those extra two channels in the rear.

This setup would move perfectly into a larger room down the road.

I've had both the M22's and M60's and your room would be better served with the M60's.