I did the wave runners on Moorea and frankly, they were just okay. Bora Bora is really the place to do this as the water is over the top. However, they had an age limit for 15 years and over even as a rider and our daughter was only 14. Moorea was more "accommodative" to this request than Bora Bora.

I would try and do 1) the shark and ray feeding (barring other comments on "taming", but I didn't like Dr. Poole at all when we went on his excursion as he is very, very opinionated about everything and quite a turn-off), 2) the wave runners in Bora Bora and still have time to totally veg out on the Motu as Richard indicated your second day. That day was almost as perfect as the private motu day for us on both trips. We floated for 5 hours on some cheap 99 cent life rafts (major envy of everyone else on board) we brought, going back and forth to have our coconuts refilled with what ever libation you desired. We were so relaxed and in the "zone" that our vacation really became a reality on that day. Not to miss!