I am not up to date with the wine shops in Zurich, for some reason most of the better ones are in other towns, but I have some Restaurant suggestions:
Restaurant Riesbaechli,
www.riesbaechli.ch, this place has one of the best wine lists in the world. Check out their website, the list is about 150 pages. The food is good, wine prices are on the high side.
Lindenhofkeller, website is
www.lindenhofkeller.ch.Excellent food and service, charming ambiance, great location in the old part of town and the wine list is pretty good. You can drink Coche Dury for a fraction of U.S. retail pricing.
Zunfhaus zur Waag. This is one of the old traditional Restaurants serving Swiss Specialties in a very nice setting. The building dates back to the 16th century. Upscale, and they may require that you wear a Jacket . Check when you RSVP.
Caduff's Wine Loft,
www.wineloft.ch.this is a casual place and the winelist is better than the food.
The interior is very contemporary, but they have an old cellar in the basement and you can go down there and pick your own wine.