Patience is a virtue... although you generally seem to have a hard time waiting. ;\) I'd say listen to the M22s and see if you like what you hear. The M80s have more body, which you might like, but M22s paired with a sub are also quite excellent. Absolutely wait on the sub, unless you're willing to send back just one set of surrounds to get a sub. Why in particular that sub?

I am the Doctor, and THIS... is my SPOON!