If you can afford, I would suggest the M22. By the way, given that the speakers and listening seats are placed symmetrically as shown in the diagram, I suspect that the "odd shape" of the area would only improve the acoustics as compared with a straight rectangular room.