The M6. You should look at the 35mm Ultron 1.7 I have no 40mm framelines but the 35 that's on the M6 seem to be 100%. I am getting more use to it.