I'll probably just get the cheapest seafrogs case with the flat port (it can take the 10-18 and 16-50). And add a wet dome to it (6inch or 8inch if I manage to find the old ones). So I keep that flexibility while diving.
That won't work; the basic bundled port has no threading and is approximately 100mm wide on the inside, where threading would go if it had it. Mounting something in front of it would require some kind of adapter to clamp around the outside circumference of the port, and while such things exist for other systems, I am entirely unsure whether they will fit this one. As you can see in the tests that I linked, the 10mm focal length is basically unusable behind flat glass - if you want to use the 10-18mm, you must use a dome, whereas the 16-50mm can be used with the separate short macro port and add-on wet lenses. Look at Nauticam port chart for Sony N85 system for examples.