Hi Cyndi,
I think it is great you are doing a pre-cruise. Tahiti is so far away, both times I went I did one week on land and one week cruise. Personally I was so glad to experience the islands with the natives and then have the fabulous cruise on the PG. My first trip (honeymoon) we did a one week pre-cruise on Moorea at the IC Beachcomber - it is a fabulous resort but the OW Bungalows are not really over the water - more like beach bungalows. But they do have an outside deck that you can snorkel from. The grounds at the Beachcomber are absolutely beautiful. Our 2nd trip we did a precruise with 3 nights in an OWB at the Sheraton Moorea and 3 nights at the Pearl Beach resort on Bora Bora. Both the Sheraton and Pearl Beach resorts had deep OWB. For snorkeling I would pick the Sheraton, deeper water from your Bungalow - at Pearl Beach in BB the water was much more shallow and not as much fish. I really don't think you can go wrong with any resort on BB or Moorea. It depends how much you want to spend - they are all expensive. The top end resorts on Bora Bora are the new Sheraton Nui and Hotel Bora Bora - but you will pay close to $600-$700 per night for deep water OWB. Bora Bora is more expensive than Moorea because it is more remote. BB's Lagoon is a dream come true, but I think Moorea is a prettier island. I have heard great things about Huahini at TT - I've also heard the Pearl Resort on Tahaa is absolutely incredible - but I have not been to either. I hope this helps, but if you would like more detailed further information, please visit Tahiti-Explorer.com. You can also purchase a resort guide from that website at a nominal fee.