As a follow-up to my question:
The hotel check-in agent couldn't have been nicer.
He attached my Diamond number to the reservation and said that he would try to find me an upgraded room. I told him not to worry about it, as I wanted to unpack and rest. He looked around for a moment and was able to find me a renovated Executive room.
He gave me the internet code and programmed my key for the Executive Lounge.
He thanked me for my loyalty numerous times.
A great stay.