I have the dedicated 12-50 port. I use it with the zoom and the 60mm macro. I am finding the zoom so versatile (semi-wide scenic to fish portrait, plus power zoom for video), and the macro function so effective, that the 12-50 stays on the housing 70% of the time. Right now, I use the 60mm only if I am going on a dedicated ultra-macro hunt for tiny fingernail-sized things. However, I might add the nauti super macro diopter on a flip adapter to the 12-50 and have almost the same capability, plus the versatility of the zoom.
For wide angle, I will differ a little from burhan and strongly recommend the 9-18 mm with the 4" dome. This is great for all sorts of wide angle work. No need to get the pany 7-14 (which I have). I like the rectlinear look better than the fisheye look for UW scenics, and the zoom is MUCH more versatile. I see that you don't have the fisheye. that being the case, it is really no contest, just get the very moderately priced dome for your 9-18mm and, with two ports, you cover everything from wide angle, to portrait lengths, to ultra-macro.
For wide angle, I will differ a little from burhan and strongly recommend the 9-18 mm with the 4" dome. This is great for all sorts of wide angle work. No need to get the pany 7-14 (which I have). I like the rectlinear look better than the fisheye look for UW scenics, and the zoom is MUCH more versatile. I see that you don't have the fisheye. that being the case, it is really no contest, just get the very moderately priced dome for your 9-18mm and, with two ports, you cover everything from wide angle, to portrait lengths, to ultra-macro.