We also did the jet ski on BOra Bora and it too was choppy. I would suggest doing it in Moorea. We had some nearby passengers take the jet ski boat ride and they loved it over the jet ski.