My main complaint is they applied the water policy across the board.

Try staying primarily in Accor properties that are self-contained resorts at the equator where you primarily stay on the property the entire time. While everyone supports sustainability, being conscious of every glass of water you drink is stressful and very annoying. After a day, housekeeping will usually give you a more normal amount of water in sealed glass (reusable) bottles for the tropics in every single property of this kind. If the front desk picks a fight because there is some new clueless or non-local person, the actual housekeeping staff will send the water anyway.