Seems to me you have sold yourself on the M22's, so lets move beyond that. You also say you want more "oomph" up front, so this pushes your selection into the M40-80 Line. You have a sub, so listen to the M40-80 for mains, use the M22's for surrounds.

Personally, I think the M50 would be a good match. Your budget and listening may say otherwise.

Regards,

BBIBH