I don't do Leica, but I've heard great things about them. The Voightlander lenses are supposed to be excellent. 21mm should be suitably wide for virtually everything.
I do a lot of my photographic "work" with an old Crown Graphic 4x5 -- brings whole new meaning to the term "manual" in photography.
I know it won't do it justice, but post whatcha get with that beauty, will ya?
Dan