Others may disagree, but I think Bora Bora is a bit overrated and less time there is ok. It's been 5 years since I was there, but it had the feeling of a place that had seen better days. I liked both Raitea and Tahaa, the latter because of some interesting events that happened including our being driven around in an old jeep by an resident who didn't speak a word of English- only French and who had some interesting perspective on things.

I did a pretty good hike on Moorea and wished I had spent more time there- was only there for a full day. Perhaps I'm filtering this through my own perspective, but I'd swap a Bora Bora day for a Moorea day.