Thanks -- looks and sounds lovely. We've booked a junior suite for our visit at the end of June, so even without an upgrade it should be a great stay. And we're lucky enough to have three nights booked.
It might be better for you not to get an upgrade - the 1BR suites are weird.