In Cabo I would highly recc Manta Scuba, very proffessional guides. And in Cancun there are several dive shops there and in Cozumel.