Sue,

Yes, for the 7-night itinerary, I believe Raiatea is always through an outside operator because the PG dive staff is busy on Sunday working with the beginners in the Discover Scuba session.

I haven't been to Huahine.