I will be attending the first day of 2 tennis events in Madrid and Barcelona. Plane ticket is already booked, zero accommodations have been booked. I am in my 30s, fairly active and a fast traveler. I spent 3 months (over two separate trips) in Western Europe last year and found 3 nights to be perfect # of nights for a place. 4 nights seemed to drag on and by the last night I started to get an itch to move onto something new. I get restless very easily after one or two full days especially for places with less sights. 
I am a bit hesitant about the 5 stops back to back with 2 nights each in itinerary B. I stayed 2 nights in Venice,Naples, and Rothenburg ob der Tauber which was perfect time for each, I coulda used an extra night in Venice in hindsight. The Basque region and Gibraltar are not as important to me as the other places I have listed, are they worth the sort of rushed itinerary?
A:
Arrive Wed 4/12 4n Barcelona (Barcelona Open Sat. April 15 - 23)
3n San Sebastian DT Bayonne,France
6n Madrid DT Toledo,Segovia,Salamanca  (Madrid Open Mon. April 24- May 7)
2n Granada 
2n Ronda 
2n Sevilla   DT Cordoba 
3n Lagos  (Bengali, Salema) 
4n Lisbon  (Sintra, Tomar?, {AM Obidos- PM Nazare(Sitio) combo?}] 
3n Porto  (DT Coimbra) Depart Thur 5/11
B: (2 nights unaccounted for)
Arrive Wed 4/12 4n Barcelona (Barcelona Open Sat. April 15 - 23)
3n Madrid DT Toledo,Segovia,Salamanca
2n Granada 
2n Ronda
2n Madrid Mon (Madrid Open Mon. April 24- May 7)
2n Algeciras (Gibraltar)
2n Sevilla     DT Cordoba 
3n Lagos  (Bengali, Salema) 
4n Lisbon  (Sintra, Tomar?, {AM Obidos- PM Nazare(Sitio) combo?}] train >
3n Porto  (Coimbra) Depart Thur 5/11
If I go with itinerary A,  is there anywhere I can remove nights to give to Gibraltar? 
With itinerary B I have could have 2 nights for San Sebastian but unsure where to place of if I should just skip it? Any other suggestions or tips or is there a better itinerary I am not seeing?