I would recommend going to the Rochers de-Naye. Stunning views but no village. It is above Montreux.

http://www.swiss-riviera.com/naye/

Regarding thermal baths, I just went to the new one in Charmey close to Gruyere. It is new and spotless and is in a very nice setting.

http://www.bainsdelagruyere.ch/fr/