You could always phone the hotel for some advice/ suggestions?
Wow, two stays and two exec rooms. My experience nowhere near as fruitful. Three stays, 2 deluxe and 1 no upgrade. Not busy weekends. Argument over if I could use the exec lounge or not on one stay as I was not in an executive room. For this reason unfortunately it isnt my priority hotel now in London, although the location is fab.
Totally agree with the Trafalgar- superb hotel, I also really like the Hilton on Park Lane, Canary Wharf, the Courthouse Doubletree and the Bentley. I should try the Waldorf again, it may have just been unlucky I guess.