I think you are on the right track. If I were you I would get a sub with the M22's. I keep telling people this but Outlaw Audio has a very nice one. For music the sub with the M22's and VP100 would be nice (I have not heard the VP100 but do have the M22's).

To make sure you are going with the right system you may want to call into Axiom and spend some time with the people there going over what you have, want and need.

Good luck.