I've been to a resort down in baja California called Eden Loreto and did lots of diving around Loreto.

Visibility was around 60 feet and it was like supercharged SoCal diving on steroids with warmer water and some tropicals.

They have a clothing optional beach there which was nice and clean that they only allow guests there so no leering locals.