We are thinking of going there once more; haven't been able to visit all places we wanted to visit
As to Madrid, it's a nice city. We've been just passing through it but it didn't look that overflown with tourists. Still, many most probably are going there since it's the capital, but I doubt they're staying there for long.
So, yeah, my vote goes to Barcelona