It was Easter 1985 (!how old!) when I stayed in a pension on the grand via for only three nights - not long enough.
I recall seeing some of the things you have photograped, in hot sunny weather.
My vivid memory of a then dusty Madrid was walking out in the cool of the first evening and happening on a fab Semana Santa firework display on the smallish road junction at Callao I think. Way too little space for a massive display. Standing less than ten yards from the men lighting things by hand, and the explosions had everyone reeling back against the buildings. What health & safety back then.
I made a daytrip to El Escorial and realised I could stay in Madrid for much longer; but stuck to my plan and moved on to Toledo, then staying a couple of nights in Sevilla, Granada, Cordoba, then back north staying at Merida, Cacares and Salamanca.
Next time I'll do what you did and have a leisurely week exploring the capital.