Okay! I'm booked and upgraded (well, as soon as the Costco AA gift cards clear.)
Arrive 7:45 pm Nov 9, depart 6 pm Nov 14.
Am staying somewhere on points, probably the IHG Indigo, although a friend is encouraging me to use his favorite local 2* hotel just off Nanjing road for $49 US. (Metropolis Shanghai (not Metropole) if anybody is interested in "a clean, safe, adequate, inexpensive room" recommended by a total stranger.