Since you'll be moving to a house with more space, and you have the money for the M60s, I wouldn't bother with the M22s. Even though your current room is less than ideal, the sound won't suffer enough to make it worthwhile to go with the M22s for the short-term.