I have that combo and use the 100macro, 17/40 zoom, Sigma 150macro - occasionally the Sigma 50macro. Aquatica web site is the best bet for port/extensions advice.
The 100macro is excellent in either its current IS form or the non-IS. No supplementary dioptre needed.
I find the 17/40 excellent also - very,very sharp, close-focussing, great contrast - I use it behind the 8" dome with a +2 although I find this is only really beneficial when there is some element of the photo pretty close to the lens. You cannot really predict what you are going to find on most dives so I use it all the time. I never use this lens below f8 as wider apertures have more corner distortion at the wider focal lengths. Better to bump up the ISO ( few penalties on this camera) than widen the aperture IMHO. There has been a lot of debate about whether the 16/35 is better. I think the consensus probably is very marginally so. In my view not worth selling what you have and trading up. Both lenses suffer from corner softness to some degree but it rarely seriously bothers me. With all the MP on this camera, you can "shoot to crop" and get rid of troublesome corners later and still end up with a super, big file.
The Sigma 150 is brilliantly sharp and definitely recommended. No dioptre and I use it behind a standard port and the same extension as the 100macro.
The one thing I miss is a mid-range "hunting" type lens - ie something to use when you don't know what you are likely to come across. Your 24/105 would do the job and Aquatica make the bits for it but I have held off as there is virtually no feed back on its underwater performance. So I suggest you get the bits for it and then you can let me know!!!
I have no exdperience of ultra-wides. Hope this helps