Tahiti is great, but it's the next 2 islands that have the coral reef that surrounds the island (plus white sand), which makes for amazing snorkeling. We used to scuba dive, but that novelty wore off after many years because, in clear water, you can see pretty much everything snorkeling that a scuba diver can see.