Absolutely madrid, hands down. There were a lot more tastings and we got to see some really cool local places! If you can get Arantxa as the guide, you should because she gave us a lot of really good information about the food, the culture, the area, the history, and even about travel tips for other areas in Spain we were visiting. The Barcelona tour was great too, you can't go wrong with either. But if I had to choose one it would be madrid.