Tahiti proper I'd skip now that I've been to Moorea. You'd love Bora Bora, it's just slightly harder to get to than Moorea, and Moorea and Bora Bora are otherwise very similar (Bora Bora winning by a nose). If I were planning a return trip, I'd probably fly to Tahiti then immediately take the ferry to Moorea and stay there the whole time.