As per http://www.seacamusa.com/16-35-test.shtml I am going to 16-35mm II lens, from 17-40. Lens still in great shape, and can be purchased with UW modification as per http://www.seacamusa.com/most-recent-1740reflections.shtml or restored to original.
Recently sent to Canon Professional Services, to confirm accuracy of focus @ $125 service fee.
Here's what they are doing on B&H now, so I figure $425 is a fair price.
liz@stephenfrink.com if interested.