I agree with doing the wave runners on Bora Bora. We didn't and regret it now. Plus, Bora Bora has the best lagoon of all the islands.
Also, you mentioned doing an air conditioned bus tour on Moorea. I would avoid any air conditioned bus tours in French Polynnesia. We did one in Tahiti this winter and regretted it. The bus was crowded and the weather so hot that the air conditon couldn't keep up. Go for the photo tour or one of the snorkeling ones. You can do bus tours anywhere. This is paradise and you want to be out in it experiencing everything you can.