First of all, so nice to hear your wonderful news!!!
RE you cruise:
Try Mark at Huahine Nautique if you are interested in a snorkel tour while on Huahine.
Another suggestion is to book a car with the
wonderful folks at Huahine Europcar and have a lovely time driving yourselves around the island. They'll collect you at the tender dock and you'll be on your way quickly. Great snorkeling off Relais Mahana on Huahine Iti.
Huahine is a beautiful island and our favorite in FP...well, in the entire world actually.