I loved them both for different reasons, I went last year for the first time. As another commenter said Madrid felt very imperial, and as you say was beautiful, clean, and walkable. Barcelona felt more arty and had a great coastal vibe to it. I would go back to either in a heartbeat!