Just to update (currently still here), it turns out I was indeed upgraded the last two nights of the trip for free after upgrading the first. However, unlike what the Hilton app showed (that I was already upgraded the last two nights), when I checked in, I was asked if I wanted to pay for the remaining two nights . I played dumb and said no, and they operated under the assumption I would be changing rooms (even this morning when I asked how switching rooms would work). After not hearing from them for basically all day when they were supposed to tell me when my other room was ready (past 3pm), got confirmation I was upgraded the last two nights for free so didn't have to move.
Not exactly sure what happened behind-the-scenes (did they upgrade me my remaining two nights on the app in case they thought I made a mistake by only using Nor1 for the first night? or were they really going to upgrade me all along but see if they could squeeze more money out of me?) but I got what I wanted, so I'm happy.
The overwater pool villa is really nice. On my side, we get sun in the morning which I like, but sun is blocked in the afternoon. And don't see the sunset. Can't win em all and that's why they have the higher levels for more money

Breakfast is indeed amazing, the pastries are so good (not overhyped by the property at all). Had sushi last night, which I heard mixed things about. It definitely was not the best sushi I've had in my life (pieces were hit or miss). The more expensive nigiri on the menu turned out being the best generally, so at least that's priced right (Himachi, beef, and salmon w/ salmon roe were pretty good - the shrimp which were apparently bathed in vinegar, and tuna, were not). French tonight and Banyan tomorrow. Wish Banyan was open on the weekends as I really wanted to eat there the most as it seems that is the most celebrated restaurant on the property on here.