I may have to check out Riveria Maya.
I have had the 'luxury' of snorkeling some awesome locations. Its soo easy and sooo much fun. If you have time out see if they have 'resort dives'. A resort dive is for the non-certified tourist types. They cover basic hand signals and equipment in a pool then you go out for a shallow water dive (no more than 50 feet). I did a 'resort dive' in Nassau this past May and absolutely loved it! I was hoping to get another dive in before the end of the year but that doesn't look like that is going to happen.
Me in Nassau about 40 feet down.