7 Days in CZM next month - Father and Daughter - Recommendation for Lodging with good shore diving - not all inclusive

My daughter (31) and I are meeting up in Cozumel to do a 7 day trip focused on diving. Driven myself nuts looking at places to say and weighing the pro's and con's. Ideally, this is what we want:

1. 4 days of diving with a small boat 6-8 divers
2. Ample/easy opportunities to shore dive from the place we stay, tanks available - we want time in the water as we aren't very experienced and are meeting later this year in Thailand to dive there.
3. SIngle room with two beds that's not a total dump
4. Not all inclusive unless it just makes sense

Looked at range - Blue Angel, Casa Del Mar and the Presidente plus a zillion others it seems. Blue Angel seems to check all the boxes but recent reviews and such really make it seem like the place is in very poor shape. Between the PADI deals, advertised rates and credit card points - I can make most any place work, it's just finding the ideal one for what we want to do (items 1-4).

Let me know your recommendations.