Pre/post cruise ideas for staying in French Polynesia?

Hubby and I are taking a 12 day RT Papeete cruise for our 50th anniversary in March/April 2025. I've been looking at possible add-ons to make it a longer trip (from the U.S. west coast.) It looks like it would be most feasible to just stay on the island (Tahiti) for awhile, though I'm hearing that staying on Tahiti itself is not so ideal. The cruise itself goes to seven other islands (including Moorea and Bora Bora), so we're not sure about traveling off of Tahiti/backtracking for our extra time. Cruise starts on a Wednesday and ends on a Sunday. We prefer to stay in Airbnb places. We have been avid scuba divers, but now in our 70s, we think it best to just be leisure travelers these days. :-) Given all that, maybe we should just do the cruise??