I am looking at a trip to Cozumel or Cancun in April or May. I will be traveling with a non-diving spouse. Which offers more activities for the non-diver? I have heard about the diving in Cozumel, what is it like in Cancun? What are the water tempratures currently?