I thought either a 24mm f/1.4 was missing from Joel's list as well.
I think I would add it and the 35mm f/1.4 L and leave the 16-35mm behind. You just wouldn't need it.
I would think you would get some good land / seascape views on a cruise, but what do I know I have never been.

Also the 100mm macro? Great lens but not sure where it will come in handy. Maybe bed bugs in your cabin?

How about adding a Lee Holder and a good set of filters.