With 70% music I would definitely go with the M22s. I use M3v2s for casual listening when in that part of the house and for music while working out, etc. I love them for that. Sound great and no sub required at all. They are definitely my "fun" speakers, which I won't be offloading anytime soon.
For "critical" listening, however, the M22v2s mated with a 10" sub is a considerable step up. They really are a more precise sounding speaker, without being sterile like I find the M2v2s to be (precise, yet somehow boring, lifeless). Money spent in this direction would likely net higher immediate benefits than the fantastic QS8s, which you will definitely upgrade to eventually.
