Mexico spas???

Okay, so I've been searching google, tripadvisor, message boards, etc.... and I'm gonna ask here too...
Has anyone gone to an all inclusive (not mega resort) hotel/spa/yoga retreat/healthy food/ kinda joint for a week or so? I've found a couple places and one is really cool, at the beach, but no pool... one is really cool, has a pool, but is by Guadalajara and has no beach :( (snorkeling with fishies is my happy place...) (but I'm taking mom-who has always wanted to go to Guadalajara) and the one perfect place is actually clothing optional which wouldn't bother me, but might wierd my mom out...hmmmmm, anyhow,
here's the 2 places I'm thinking of...
http://www.riocaliente.com/index.html
http://www.puntaserena.com/spae.htm
anyone been there? or somewhere amazing like that?
gotta book this soon.
Thanks much!
Pea

Haven't been to either one of them....but if I was choosing....I would go with the Rio Caliente....it just looks more holistic oriented as opposed to spa oriented, based on their websites. I have always wanted to go to Sedona for a week and stay at a retreat and take advantage of the energy there.

What is your Mom most interested in?