With 25 days total, you may consider splitting your time in the Yucatan between Cozumel (focused on ocean diving) & the mainland (for ocean diving, cenotes, a day trip to whaleshark snorkel and non-scuba activity (ruins, beaches, Maya culture, etc)).
Logistics in the mainland may be tricky, as...