A vote for Maldives here. You won't be disappointed. Haven't been to Bora Bora, but did extensive research on this board and others when asking the same question you are.
Distance is further to Maldives than Bora Bora, but less so from east coast.
Though the snorkeling is good at both, Maldives is generally considered better. I found it to be unbelievable.
Beaches are much better in the Maldives, but island scenery and culture better in Bora Bora.
Food in the Maldives is generally considered to be better quality. Both Bora Bora and Maldives are expensive, though.
Most Maldives resorts do have fishing and other activities. I wasn’t bored at all staying nine days at one resort.