For diving or snorkeling trips where you are going to stick to the more developed islands, the diving around Moorea is better in general…plus it’s quite a bit less expensive. When go back, if I’m not doing a full on dive trip to some of the farther out islands like Fakarava, I’d probably do the same thing I did last time - like 5 nights on Moorea and 3 on Bora Bora.