I would second the trip to Girona!
And for Andalucia, I would suggest a day trip to Ronda, which was my FAVORITE town in Andalucia. It's a bit of a trip - almost 2 hours - but the views from its mountains are breathtaking. I can't even put it into words.
Haven't been to Segovia and Toledo yet, but everyone keeps telling me I can't miss them. I'm going to be in Madrid from the 20-23 then in Pontevedra, Santiago and Ourense from the 23-27 and again in Madrid until the 31st... I'm hoping to get to at least one of them on the last few days since I plan to be jetlagged on the 20th, I'm going to a concert on the 21st and I need to spend at least one full day with my friend going through the city before I go to Galicia since I'm invading her house!
Melinda