I just got back from French Polynesia last week. We opted to fly into and out of Tahiti but dove Rangiroa and Bora Bora. Regardless, I would highly recommend Top Dive for your diving. There are shops in Tahiti, Moorea, Bora Bora, Rangiroa, and Fakarava. They sell 10 dive packages that can be used on any of the islands which will save you some money. Lucien Schmidlin, who owns Top Dive, is a friend and an avid diver (he's currently on the Sardine Run with Wetpixel's Eric Cheng). He also owns the Bora Bora Dive Resort, and etahiti travel (
www.etahititravel.com). He would be a good resource for you. I had him set up my entire vacation -- flights, transfers, lodging, diving, etc. He did a terrific job. As a "local" and a diver he will take care of you.
My trip report is on my website (
www.debersole.com) under "News"
(I can't get the direct link to it to work)
Also, here are some photos from the trip:
http://debersole.com/layout/0001/gallery_view.cfm?g=88
My wife and I absolutely loved French Polynesia. You'll have a great time. Lots of sharks (gray reef, silvertip, whitetip reef, blacktip reef, and lemons), mantas, eagle rays, dolphins, turtles, etc. The water in their "winter" in June was 84 degrees with viz consistently over 100 feet.
Doug