Spain/Portugal/Gibraltar - Spain - Old World or Wine Country

Hello, I'm planning a Spain trip in early September. For now we have 2 nights in Lisbon (I know, not Spain), 3 nights in Madrid and 3 nights in Barcelona.

We have 4 other nights that we can use. We can't decide between 2 nights in Seville with a drive to Cordoba and Granada or fly to Bilbao, stay a night, rent a car to Elciego and stay at the Marques de Riscal for 2 nights, spend a day in San Sebastian and then fly back to Madrid.

We love wine countries, we go here in California all the time, plus our honeymoon was in Chile and Argentina, but the idea of passing up Seville and Granada bothers me if we aren't going to be back for a while. Are we better off adding a day in Madrid and doing a day wine tour and then spend 3 nights in Seville/Granada, or just sucking it up and pick one area over the other?

I don't get your title of Old World or Wine Country, not when applied to Spain.

There are wines grown all over Andalucia, so I don't understand the need to choose between Sevilla and Granada and a tour of wine country.

How about a visit to the Montilla/Moriles area:
http://www.rutadelvinomontillamoriles.com/
If you're thinking of going to Cordoba anyway, then this region is not even a detour.

Here's a map showing where this region is in relation to Granada, Sevilla and Cordoba (http://maps.google.co.uk/maps?f=q&source=s_q&hl=en&geocode=&q=montilla,+cordoba,+spain&sll=53.800651,-4.064941&sspn=20.383829,55.283203&ie=UTF8&hq=&hnear=Montilla,+Cordova,+Andalusia,+Spain&ll=37.348326,-4.86145&spn=1.707415,3.4552&z=9)

Ok.. That's good to know.. It seemed like when I was doing some research the Andalucia region was mostly for Sherries and that's not really our thing. The Rioja region seemed to be where the big reds are, which is more our type of wine. But if we can find little gems throughout the Andalucia region then that sounds like a perfect compromise. Exactly why I posted here.