Rob,
Since you have posted 20 days until paradise, I believe you will be fortunate and be in French Polynesia when the whales are. They migrate there each year from Antarctica to mate and deliver their young. When we were there last October we were lucky to dive alongside a mother and her calf when we were diving at Tapu. All the divemasters are great however, my favorite divemaster is Dominique. He is French Polynesian and really tries to show you a great time and be honest about the water conditions at the time you sail. I usually go and speak with him before I sign up for dives, although I now dive as much as I can because it is so beautiful. Most of the dives do not go to great depths but your dive time is typically longer. If I was limited I think I would definitely do Tapu in Bora Bora and Shark Gallery in Moorea. I have been to Tapu when the water was murky because of a recent storm, but then I have dove and it has been excellent visibility. That is why I recommend speaking with a divemaster at the Tour Desk before you sign up because they will have the recent water conditions. I personally feel the ships dives are better than the two offered through outside operators. There isn't much to do on Raiatea other than the outrigger canoe trip because everything is closed on Sunday so if you don't do the canoe trip you might consider Mushroom Patch, but not at the expense of Tapu or Shark Gallery. If you have any other diving questions I will be happy to respond. Hope you have a great time. It truly is paradise in my book.