Don’t forget about cenotes (if you like or want to try cavern diving). Also trip to Cozumel is really worth additional time (and money) especially if it’d include one or more of Palancar dive sites (there are 4 horseshoe, bricks, gardens and caves - not really caves but massive reef formations resembling ones)