Ed, when are you coming?
Your plan is good except Tahiti. There is no need to stay there for two nights
in the beginning and there is ABSOLUTELY no need to spend your last night
there (unless your plane schedule is bad).
From my experience, some flights arrive very early so you can pick the earliest flight
to Bora Bora right away - this is our case on our upcoming trip - that way
with a RA treatment you get an extra day in Thalasso, or
very late so you need one night at IC Thaiti, but that's it. No need for two,
trust me.
IC Tahiti is a nice hotel, but Tahiti island has nothing to offer
comparing to BB. It's large with traffic, trashy streets and very poor neighborhoods...

Bora Bora is a paradise from your dreams :-)

As far as Thalasso rooms, there are three rooms on each
of two "forks" which offer unbeliveable view of Mt Otemanu straight from
your bed. Other than those three (6 total) all the Diamond and Saphire
rooms are pretty much the same - the same kind of partial mountain/
lagoon view. Try to get one of those 6 - you can easily see what I'm talking
about looking at the map of Thalasso (look up on google, it's
on the other Thalasso website)... If not, having you Saphire reservation
you're fine.

Have a great trip, don't forget to buy your lady some pearls

Andrew