You should probably post this thread on the "PhD in Economics" forum in order to get comments.
I guess that most of the TMers will advice you to go to UPF if you want to do a PhD in a top US school later. I don't know whether your other option (London) will change the situation, though.