Thanks for all the suggestions. I think the Andaz would make the most sense, despite the lack of a lounge and significant view. But I decided to leverage my last few months of Hilton Diamond status to book the Waldorf Shanghai on the Bund, on points, given the excellent success rate reported for river view suite upgrades plus the atmosphere and location of the place.
Too many great options! Now to cancel my GH reservation...