wow...>2000 posts and new Diamond...finally I'd say !
I would never book an awaken package personally, as you say you get the relevant stuff for free. Only 4pm cko is not guaranteed, and when negotiating as a diamond YMMV. However, in most cases 4pm would have been possible, and you don't even need it.
Upgrade of course is a lucky draw, but even there I would personally go off the basic room category, except when with the family.
As for the change to the lower rate, I would call CS and give it a try, telling them you just realized the magnificient diamond perks.