I believe they may have cancelled the shark feeding on Bora Bora for environmental reasons, but I'm not sure. I thought I heard somewhere that they might ban the ray feeding as well at some point.
An excursion a day is a nice balance, although in Bora Bora, an afternoon out on the motu is a good alternative, if you like sun, sand, water, a beautiful view, and peace and quiet. Renting a car for an afternoon on one of the islands is an alternative as well. Try to get up to the Belvedere on Moorea, the view is spectacular!
What are the choices left on Raiatea??