Thank you everyone for all your advice. Gil and I went ahead and booked the following tours taking into account your comments:
Raiatea
Classic Sailing Tour
Rangiroa
Snorkeling Rangiroa's Aquarium
Bora Bora
Stingray Ballet and Snorkel Safari
Sunset Blue Lagoon Escapade
Coral Preservation & Snorkeling Program
Moorea
Lagoon Discovery with Snorkel
Dolphin Watching Expedition
Capture Moorea Photo Adventure