Hi Phil
Geneva is for losers !
Take the train (or hire car) and stay in Montreux (away from all the riff raff).
Suggest the Montreux Palace in Montreux, or if you fancy an unforgettable view, try Hotel Victoria in Glion (train to Territet - funiculaire to Glion). you won't regret it.
http://www.victoria-glion.ch/
brgds
CG