Been to French Polynesia twice.
Stayed @ several resorts. I got an experience of a life time. The channel between Tahiti & Moorrea I swam with sea turtles, saw flying fish & dove alone side of a baby humpback whale & its mother. Her baby made me feel micro. Extremely humbling. In Moorrea white tip shark dives @ Cooks Bay. Can also snorkel & observe stingrays. Small blacktip sharks will intermingle. Not to worry. They are snooping for fishbait, not you. The One & only Bora Bora, great shallow dives. If the Instructor/ DM feel comfortable with skill levels, giant manta dives in the channel between the motu's & main island are a chance of a life time. A manta hot spot seemed to be near Le Meridien, where there was a deep break to the open ocean. Their shear size & gentle gracefulness is awe inspiring.
If you have time in Tahiti, make reservations for a sunset dinner @ The Belvedere. It's resided high on a mountain. Check out the sirloin tip fondue for two. It has changed ownership. Deteriorating road conditions had it closed in 2015. Hopefully the road has had attention.
Food rated very good, the ambiance & experience is worth it.
On Bora Bora dinner at Bloody Mary's not to be missed.
I have experienced both & made a French Polynesian photo album to look at often. I worked with Liberty Travel & became a Polynesian, Hawaii & Australia specialist. I'd go back in a moment, then hop to Fiji.
Best scuba advice, be open about your experience & comfort level. The dive operator will help both of you choose a fantastic experience. On Bora Bora see if Katie LaBatte is around. Started NemoWorld Dive Op. over 16 years ago. Nemo has changed names.
May you have a fabulous time. Best wishes to you both.
Brian D L