Definitely do the wave runners on Bora Bora. My wife and I did last summer and we loved it. We also included a ATV stop on one of the islands on the waverunner trip. That was a nice break. The guides take you to the other side of Bora Bora where you get off for a while. The guides discuss the art of climbing palm trees and then you all climb on ATV's and follow trails around the island. I had never been on at ATV and I'm 50 but I did enjoy it. But racing around Bora Bora on waverunners was one of the most enjoyable things we've ever done. I can't imagine Moorea being quite as much fun for that activity.

My wife and I are also divers and did four dives in Tahiti. If you get a chance to go under the water, take it. The diving was excellent, as was the dive staff on the ship. The diving around Moorea was unforgetable and not to be missed if possible.