Lodging: Huatulco or Puerto Angel? Dive ops?

[WaterWayne]

Looking forward to the first week of July, I'm investigating the lower Pacific coast of Mexico. Since both Huatulco and Pto. Angel are accessible from each other for day trips, do any of you have recommendations for lodging in one vs. the other? I've already learned that Huatulco has easy-access shore diving; what about other sites? I like getting away from the tourist-beaten track, and I'm native-fluent in Spanish, but I don't need to squat with the backpack-on-a-budget crowd.

I've just emailed Hurricane Divers, Buceo Sotavento, and Azul Profundo -- the first one was well recommended on this board, while I didn't find any reference to the other two on SB. Any others?

TIA,
Wayne