The Playa Del Carmen thing, I wouldn't stay there and expect to dive Coz very much. But you might consider staying in Playa for a couple days to do the cenote diving and the Mayan ruins.
Oh, check out Isla Holbox for whale shark season, I think it is later in the summer.