rotipom,
You won't be moving to a smaller room in the future, so the M60's will be a good choice because of that.

You can't really crank anything up where you are, so a sub won't be of much use right now. The M22s aren't quite as robust on the lower end, so the M60s will be a good choice because of that.

In your example, you did not consider the cost of stands for the M22s. That closes the price gap to the M60s.

If you get the M22s, it appears that you may go for a less expensive sub and that may mean you will be disappointed later when you have a larger space that the sub won't be able to fill.

You do have the 2 chioces you mentioned above:
1) M60s now, good sub later
2) M22s now with STF-2 sub from HSU

As with Ravi and spiff, I like option 1 because it gets you to where you want to end up. Option 2, while it is cost-effective and will work, is a purchase that will cause you to spend more to upgrade later. And with option 2, will your really be able to pound a sub in your current situation anyhow?