Snorkel choices for day cruise?

We're going to be in port on the MSC Divina on 12/11/16 from 8:00 a.m. - 6:00 p.m.

Given that time, what would be our best choices for snorkeling?

Specifically looking for:

Clear water (I like to film/pictures)

Lots of coral/fish (don't care much for sea grass and sea turtles)

I was thinking about one of these two from TA:

http://www.oceanencounters.com/en/diving-a-snorkeling/snorkel-trips

or

http://www.scubacao.com/

Seems that both of the above only do the same 2 stops: Tug Boat and Directors' Bay

However, we are not adverse to a ship excursion (I just don't like snorkeling with like 30 other people as it gets crowded and you get kicked and things), or even doing beach snorkeling (I read there's some good snorkeling spots on the one side of the area). Although if Beach snorkeling we need some place that has facilities AND lockers that can be rented to store things.

Thanks for any suggestions!