If you consider Cancun take a look just south of there at Playa Del Carmen, lots of stuff to do dry and there are several good dive shops( I like The Abyss Dive Shop) and some very good diving and also you can catch the ferry from there to Cozumel (Deep Blue is my favorite there).