Don't think there's much on Tahaa. I'd go for Bora Bora or Moorea if you enjoy scuba.