Maldives or Bora Bora for vacation?

I am torn between going to the Maldives or Bora Bora. I intend to read up on both, but at this point the main disadvantage I perceive with the Maldives is that you're on VERY small islands where I suspect there's not much to do at night (I'll also check directly with these resorts to see what entertainment options they offer, if any).

This boredom factor was a problem on an otherwise idyllic vacation to Thassos, a Greek island. Thassos is beautiful but at night there was nothing to do. We were so starved for something beyond chit chat that we'd drive our scooters into town every night just to sit by the ocean and have a Coke.

The advantage I see with Bora Bora is that it is considerably larger, and it is an island one can explore.

I love swimming around reefs in shallow water. The Maldives abound in that. I realize Bora Bora is similar in parts, but in the Maldives the majority of the accommodations seem to be in the over-the-water huts where you can dive right into the water from your room. That would be awesome.

Any advice? Experiences to share? Specific locations to visit? Things about which one should be beware. Items one must not forget to bring along on the trip (due to their not being available) ?