I travel to Switzerland about eight times a year for business. I am in ZRH now on my way back from St. Moritz (first time). The train ride is truly spectacular. Most times I am on my computer or reading but I basically just checked out the scenery the entire trip. I might consider another day or half day in GVA.
The trains are great and Switzerland is a gorgeous country. Not sure if you like to hike, but you may want to consider leaving some time to do a couple hikes.
In St. Moritz you can rent bikes and boats at the lake, so there are some great opportunities to get some exercise as well if you like. The air is so clean you want to just take a deep breath.