Personally, I am dissatisfied with the 16-35 zoom on the full-frame, underwater...
Can you elaborate a little on your 16-35mm concerns/issues? I've used my 1DsMkII and Seacam housing on about 70 dives so far (love it!), but mostly shooting macro (Indonesia). Thus, I have minimal experience with the 16-35mm lens at this point. However, I intend to use that lens almost exclusively on a trip next week (sharks in the Bahamas).
Any specific issues (other than soft corners at the 16mm end), tips on optimizing its performance, etc.? The only thing I've really heard is that best results are achieved several stops from wide open (e.g., at f5.6-f8). Any insights/comments would be appreciated.