Thanks for all the great suggestions!
I think I will skip the 105mm and just use my 60mm.
With such a long trip, and with all the weight limitations, I am just trying to lighten the load of stuff I bring with me. Therefore I will bring my 60mm and my 15mm FE.
That being said I would like a topside lens as well as a good scouting lens. It always seems that I have the wrong lens when I'm underwater. When I have my macro set up, I need my wide angle, when I have my macro, I need my wide angle.
I have been thinking about the 17-70 because it might fit my needs. Any suggestions on this lens?