The obvious choice is dba, which has one of the city's best beer selections as well as a good choice of wine. See the beer lists at their web-site. Their wine choice is better than the web-site suggests:
d.b.a. is my favorite bar. It has one of the best, if not the best, beer selections in the city. The wine list by the glass isn't enormous, but it's smart. In addition they have an amazing list of tequilas, single malts, etc. etc.