Charging for bottled water is totally common.
Tap water no..At least not with bars and restaurants I've frequented all over the world.Has it changed?
The great news is if they aren't busy Resorts World has been taking great care of Diamonds since the opening and the crush of negative reviews when they weren't.
Seems like they smell the coffee now
Those that book at Hilton where there are no suites have been getting upgraded to rooms and suites at Resorts World premium brands

That said if one is coming in on a busy weekend Friday & Saturday I wouldn't hold my breath.Good chance to get what room you actually booked
I came in expecting to have a Guest Assistance claim by checkout based on the horrible reviews
and loved the property and truthfully with a great rate didn't despise the resort fee
Admire the team and management thus far.
Anything I asked for within reason they tired to provide.I'd be delighted to go back.
I will post a review soon and my suggestions from my one experience.
To answer your question I would book at the Conrad in a heartbeat over the Hilton at a lower rate
For one reason is they may likely upgrade you better because you are in a higher tier hotel and may have more breakfast credit
and may get a better upgrade than the base Hilton hotel room
That's my perception at the moment.Keep in mind the hotel is new and evolving so YMMV