My 2 stays at the Waldorf were before I was Diamond so the fact that I was not satisfied with my treatment there may not be relevant. There are many accounts here of Diamonds being treated well.

I was, however, Diamond when I stayed at the Doubletree you referred to. The free breakfast was a nice buffet but other than that I don't recall any Diamond perks. All of the rooms are suites so an upgrade may just mean a better view. I did like the place and would stay there again.