FWIW, one of topics linked was my own topic on wet pixels.
I just pulled the trigger on a used 50mm zeiss touit lens per @dentrock's recommendation. Spent hours researching the 50 vs the 90 vs the canon. The 90 is just too tight for me, and the price of the Nauticam port for the canon is really what threw me off, as well as having to carry another port all together.
The 50mm lets me use my kit lens 45mm port with a few extensions. Once the lens gets here, I will order a pair of n85 17mm extension rings and see if 1mm less port will still fit the lens (compared to the port charts). Else I will switch for a 17mm and 20mm extension ring combo, leaving me with 2mm more than the port chart.
I will likely even try the lens in my zen dp100 dome I use for my tokina, just to see how it does.
Debating if I should even keep my 16-50 kit lens and diopter, or just switch fully to either macro or fisheye (tokina). Not sure how much use it'll get anymore.