We were signed up for the drift snorkel in the pass in Rangiroa last year but it was changed at the last moment to snorkeling in "the aquarium" due to conditions not being safe for the drift snorkel. We had done "the aquarium" the previous day and were disappointed to miss the drift snorkel but know that it is best to be safe.
We were happy enough with the snorkeling off the beach (in two areas) from the Bora Bora motu but if I had read about going to the far right prior to our trips I sure would have also explored that area.