After 5 years of using Amigos del Mar I can say they are the best as far as I am concerned. As well as the snorkel spots you listed, don't overlook Mexico Rocks, just to the north. Many miss this beautiful & shallow spot and shouldn't.
The coral variety is wonderful as are the fish that you'll see. I have seen many squid there. You can even go without fins as the current carries you along.I often see fins hitting the coral & taking chunks off, so at this spot it's a no brainer.Night snorkeling is a blast & you'll have the chance to see many large fish that just aren't out during the day. Gawd, I am so ready again, talkin about this just wets the appetite.7 days & counting for me. Have a good time.