I am in the process of changing from a D90 to a D600 underwater and face the same issue. Macro is easy - 105 hands down. I did just upgrade to the VR version - much faster focus, but I miss the confirmation that the lens is seeking focus as the VR is so quiet.
For wide angle, I'll likely miss the Tokina 10-17, but will be thrilled to get my Nikon 16mm behind a dome again. I really missed that lens. I have a Nikon 20mm as well - also a good lens behind a port. While it was nice having the zoom range of the Tokina, I feel my results with the 16 and 20 were better (film days). While the Tokina will work on the D800 or D600, not sure why I would want to. Viewfinder would be difficult to use and not sure why I'd want to use only part of the sensor. I have mounted both of my DX lenses on the D600 and it is not pretty. Works, but the viewfinder crop is enough to keep me from doing it again - especially in a housing.
Biggest dilemma is mid-range. I had grown fond of the 16-85 VR lens behind a dome port. Great go-to lens when you are on the fence of WA vs Macro. Still contemplating options there.