I would return to the Barcelona before the Olympics. Fun, welcoming, with a light that brought a smile to your face every morning.
And not the theme park for stupid tourists trying to milk their money, which is what it's become.