Have you tried moving your M22s into the same space w/ the same equipment currently driving the M40s? I would be curious to know what the room/equipment differences contribute in your case.