Here is my advice, but ultimately you will have to make your own decision.
Option 1: Take your Nikon set-up with both the 10-17mm and the 105mm. The 10-17mm will focus very closely, so while not a true macro, it will tend to give great results for "Close Focus Wide Angle" (CFWA) images. This in itself presents another compromise. CFWA is great for static object such as Christmas Tree Worms, but is less ideal for small skittish critters like clown fish.
Option 2: Have you tried to see if your 105mm Macro will physically fit into the dome port for the Fisheye? If it does, that gives you the option of shooting the macro lens inside the dome port. The limitations with this are that you might get some weird distortions that you will have to fix in post production after the fact. (You might also want to put some black tape over the lettering on the end of the lens so that you don't get reflections of it on the inside of the dome port showing up in your images.
Option 3: Take both camera set-ups and use the best one for the given dive. This will likely give you the best results, and it will give you redundancy, but will increase the bulk and weight of your luggage.
If you can do Option 3 without increasing the luggage that you will need or incurring any unreasonable additional costs, then that is likely your best Option. It is, however, for those very reasons, the first one I would eliminate.
If it were me, and if the 105mm lens fits inside the dome port, I would take my Nikon set-up and do a combination of Options 1 and 2. You know that the dome port will work well with the 10-17mm lens, so that doesn't even factor into it. As a worst case scenario, you will be able to shoot some CFWA images. Take the macro with the dome port on a dive and see if you get acceptable results. Do not expect them to be as good as if you had the correct port for the macro, but they may be acceptable, and you can always fix the distortion in Photoshop when you get home.
Good luck with whatever you choose. (Maybe the macro port might just get delivered before you leave and everything will go as you planned.) Have a great trip.
