I'm in same boat, and actually went to Nikon for D800's DR and IQ, and for their UWA lenses -- of which I own the 16-35VR. Coming from the 5d2, 17-40L, 35L, and a few others (100mm Macro non-IS) I knew that all those would be covered. But seriously, I've never heard Canon had BETTER lens...