Susan,
We got a tube of SPF 50 sunblock specifically for Motu Mahana expecting to do the same thing as you do in trying to get on the first tender over and last tender back. We are very experienced snorkelers (never took up SCUBA due to ear problems) and plan to ask the watersports personel on board the PG for the best area to see the greatest variety of both fish and corals. We've been told that the snorkeling off the motu at Bora Bora is better than Tahaa so we plan to visit both our first week and most likely repeat them on our second week. We'll most likely also do the Land and Sea excursion on Bora Bora and Dr. Poole's trip.
Our shore excursion booklet shows 2 different trips that include snorkeling from Raiatea and I was trying to figure out which one of the two we would prefer. One is called "Raiatea Lagoon and Snorkeling by covered boat" and the other is "Snorkel and Black Pearl Farm Adventure by outrigger canoe".