If you ever make it to Tahiti, i'd recommend making takng the extra step and getting the ferry to Moorea, the smaller island to the east. Stayed at a resort called Linereva, formerly a dive centre and run by a friendly French couple. You have a coral reef on your doorstep, kayaks available and bikes to use, and well decked out beach huts. I spent countless hours swimming in / around the reef, plenty of rays, reef sharks and turtles. The pic above was taken standing on the jetty which leads out to the reef.