You 
really need a trip to Tahiti - fly in and out of Tahiti, but go by ferry to Moorea and air to Bora Bora.  Best place I've been by a big margin - even though the French are still present.  Not the greatest picture, but that's Moorea from our room in Tahiti.  Each island is surrounded by a reef so the water is calm, great for swimming and snorkeling, and unbelievably clear.  That feature - the reefs and lagoons are apparently unique to French Polynesia.  The temperature is great - much more comfortable then the Caribbean.
View attachment 348027