So after a brief "LFR" experiment (turning the M40's to face the wall -- doesn't work so well without a DSP) I moved the M2's back upstairs and put the M40's back on higher (~10.5") stands, toed in about 2/3 of the way towards the listener.
If I want really deep bass I can always bring one of the subs downstairs.