Different type OWBs at the Int. Cont. Tahiti

We are thinking about doing the two-night pre-cruise (and maybe add a third night) at the IC Tahiti for a 2012 cruise. I see that there are two categories of OWBs at the hotel, and I have read that the lagoon bungalows are newer and larger.

However, are they that much better? Can you snorkel from them, and is there much to see? An extra night would cost $730.

Because the hotel has the lagoonarium and nice pools, is even the Overwater Motu Bungalow worth the extra cost, or can I just do my snorkeling in the lagoonarium?

Personally I am of the opinion that the OWBs are better in Moorea or BB. I think there are rip tides in Tahiti so you cannot swim from the Bungalow but you may need to check this further.

The pools are lovely as are the panoramic rooms.

The lagoonarium has a number of fish. If you bring some bread from the buffet they will be all over your feet.