You would only be punishing yourself by moving from an oceanfront room (and not a lot of hotels are directly on the ocean) - that still has the infinity pool, bars, and location - compared to something like the Laylow not even across the street from the ocean with its postage stamp size pool and somewhat sketchy part of Waikiki after dark - and with a destination fee.

I'm sure Margarita-Girl isn't exactly hating her stay (or correct me if I'm wrong - and the weather has been perfect) and would've loved a suite (who doesn't - but who gives them out as upgrade in Waikiki nowadays, likely nobody) - but going to the Laylow is a massive step back. If you are set against the SW - plenty of decent non-Bonvoy hotels to choose from.