We've been to many of your stops. Bora Bora, you might want to try Bruno(L'Excursion Bleue). He's got a great day long tour that picks up and returns you to the dock. Aqua Blue is a great choice in Moorea, if you want water sports. We grabbed a taxi from the dock and did a circle island tour for a fraction of the money. Papeete has the great rance of options, likethe PG museum, botannical gardens, water spout, and more spots to snorkel than you can shake a stick at.
In New Zealand, we did basically land based tour, although we did a ship tour called Romantic Christchurch, which include punting on the Avon, a stop by the botannical gardens and various churches. Wellington is just like SF, both in sights and temperatures. We spent most of that day shopping and knocking about the city - this is also a jumping off spot for doing anything related to LoTR. Dunedin, this is a great place to grab a narrow-gauge train and head up into the mountains. Sights were incredible.
Hope this helps a little