The only problem I see was you were charged for a bottle of water. A phone call would have resolved that rather quickly.
Same topic, I have checked in a few times and while my gift was in the room, noticed that the bottles with the price tags on the dresser had already been opened. (the one time plastic cap lock was broken free). The last guest probably drank it and refilled it at the sink. I wouldnt buy a bottle of water at those prices anyway, but I have actually replaced those opened bottles with the unopened bottle I was given so someone didnt think that I was the one who did it and find myself charged. I'm not much of a water drinker anyway so it's no skin off my back but I probably should call the front desk when I see it.