And wouldn't you know it, a Leica CL outfit with the Summicron-C 2/40 and Elmar-C 4/90 came available at a price I could live with. So to make this a super outfit, I filled it in with three lenses from Voigtlander: Ultron 2/28, Color Skopar 4/21, and the Super Wide-Heliar 4.5/15, along with the 15-35mm Zoom Finder.
You might remember this scene I took with a 35mm lens where I had to stitch five frames together to make a proper panorama.

Railroad Artifacts by P F McFarland, on Flickr
Not anymore. Just one take with the Super Wide-Heliar, a little horizon fix in post process, and I've got the shot I wanted.
There are a few more photos from the test on Flickr at https://flic.kr/s/aHskzKzRTv with more to come later.
PF