For a wine shop rather than bar, don't forget Bodegas Santa Cecilia. A little out of the way but much better prices than Lavinia (15-20% cheaper) and fabulous range of Spanish wines. 

Loved Temranillo on Cava Baja. Some of the best pichos in Madrid!