I'm in the minority here I think, but I've compared the M22 and M60 and didn't think the M60 was enough better to justify the cost, so I'd say M22 with a better sub.

My biggest reason to upgrade from the M22 someday will likely be to get rid of the speaker stands and have towers instead. They'll be harder for toddlers to tip over someday.