Spent 4 years of my life in Switzerland. I lived in Basel. The entire Switzerland is soo beautyful. Its so hard to pick between Zurich and Geneva. But since you have very little time in your hand I would suggest go to Geneva..It has mixture of both modern architecture and scenic view.
While you are in Geneva, I would strongly recommend a trip to the Mountain Alps. The train ride to the Alps is very pleasing..You wont regret. Enjoy your trip
