Have you considered a 24mm lens? I tested the Leica Elmar-M 24mm lens on a Monochrom camera.

Check out my 28th guest post for the Leica Camera Blog.