Dont have time to read every reply so sorry if i suggest something else that someone has already suggested.
But for outside baths i can recommend yverton-les-bain (accessible by train from Geneva and Lavey-les-bains (much nicer but you need a car)