About original question, I would choose Metropol. A few hundred yard´s walk is not too bad. Service has been more attentive there and upgrades for a mere HHG do occur almost every time. In Paddington they seem to be reserving those for Ds only.
When considering steeply priced Canary Wharf, there is now another option DoubleTree Tower Hill within easy reach (HEX / circle/central line) or DLR. And the taxi will not cost fortunes either (when returning at early hours).