Just found a room at the Hilton Hawaiian Village for wounds in a few dollars of the same as the MER rate. Given my status with HILTON, and the fact that there is a real resort (if ridiculously huge) feel, no traffic between the room and the beach, and multiple (non-rooftop) pools, the upgrade issue is now moot.