Yes you are right, for prosperity of anyone else thinking of this option I believe either the W or the Ritz Carlton would be a good option.

(for context why I didn't, the new Marriott policy of denying points credit for a second room with a different check-out date, and different flight days, meant I "had" to move hotel anyway to get the ~USD2000 spend/points credit for the prior hotel. And then, since I had to move I thought I'd try this hotel again as its been a long time - I'm a HK resident so obviously there is no real reason to stop here (time from my flat to the airport door-to-door probably isn't that much more with a pre-arranged taxi, but was supporting a family member's trip.