Dear Dive Masters, its great that you are thinking about changing location and choosing Mexico. Our specialty is Yucatan, and its not a big diving spot. You want to go to our neighbor state Quintana Roo, also known as the Riviera Maya. Your best chance will be Cozumel of course, you probably have been. Another nice stay would be Akumal. There are stores and restaurants near any spot in Riviera Maya. Sorry to let you down about diving in Yucatan... I'm a diver as well and I have to go to Riviera Maya to dive... Another consideration Yucatan would be diving in cenotes, check this site, the dive master is a good friend of ours: http://www.adventuretours.com.mx/