Interesting spin to an old question.
Normally, in this case I would suggest going with the Sigma 15mm. The Sigma in most respects is at least as good or better than the Nikon 16mm and $400 cheaper. Either fisheye will give sharp corners, very close focus (with the Sigma slightly closer), a field of view equivelent to the wide end of the 12-24mm and a cropped fisheye view--which is less distorted than a full FE since you are only using the center.
The 12-24mm certainly is more versitile. If you want to take decent fish portraits of medium sized fish without bumping them with the dome, the 12-24mm gives you more flexibility. The corners are never going to be as sharp as the f2.8 prime fisheye lenses though (although the 8" dome helps).
But what makes this question interesting is the desire to keep your port selection down. The 5503.15 port for 180 degree fisheyes you already have will fit the 16mm but I'm told not the 15mm. I think this is because the diameter is bigger. So you would need another port. If you go with the 12-24mm you would also need another port. I was in this situation as well with three WA ports and fixing to get another to house the 10.5mm. 4 WA ports, plus 2 macro ports! It was out of control. So I switched to the 8" port and its much simpler.
With the 8" port either the 16mm, 15mm, or 10.5mm will fit with the same extension. If you want the 12-24mm you just get another extension. I also like the aluminum construction better as well.
So I think you have two decisions to make:
#1 Which port system do you want to go to. A: a) stick with 6" ports (which are fine optically) and go with the 16mm as you suggest. B ) go with the 8" dome and sell the 5503.15. Then go to question 2.
#2 Very sharp corners, simplicity, and better low-light focusing, or maximum flexibility? A: Either the 15mm Sigma or the 12-24mm (and I'd give a good look to the Tameron here).
Happy Shooting!