If you pass on the sub, I would go with a tower to give you more bass. The M80 has great extension for music. On many tracks I cannot tell much or any difference between just the M80 and M80+ sub.
I also live in an apartment, but its a conctrete box so it keeps all that bass in. I can play my EP350 at reference without any complaints. I watched Serenity at 1:00am at close to reference (the windows were rattling) and nobody complained.
P.S. If you really want a bass hump on the M22 you can just turn up the bass tone control on your receiver. You will still get better extension than the M3.
