I would certainly send a letter to the property manager with a copy to Hilton. I'm really really surprised at the no breakfast/no water offered to you as a Diamond. HGI isn't one for upgrades per se, but throw that in the letter as well and let the manager address it.

Good luck - I'd say you are certainly entitled to a compensatory offer of some sort.