The peninsula (Tahiti Nui) of Tahiti has some great reefs, lots of fish varieties including sharks - diving shop in Vairao, see Gilles Jugel, the owner. Also, Bora Bora has beautiful reefs, tons of fish, particularly "friendly" sharks. Some of the best diving spots I have ever seen. Spear one and have the locals cook it for dinner!
Dr. Manarii Tane