Big yes, to Granada, Cordoba,… (we did that by rental car)
And depending on interests in culture/arts, a few days in Madrid can also be fun. Just the lush interior of the train station is a sight by itself (we used the high speed train from Barcelona and the Costa Brava; we had booked an open-fork itinerary)
I suspect either country is worth a trip - but I don’t think you’d be disappointed if you stick with what you have in place.