Two months just is not enough time for me decide which excursions to take. Now I know why people go back!
Thank you to everybody for your feedback. It seems the consensus is to take the Lagoon Discovery with Snorkeling on Moorea. So that's two decisions made (motu day and this), the rest of the trip still to fill.

Jill