I just came back from a week in Shanghai, so I am not sure if I'll go back for this DO (apparently China only issues double entry/six-month visas for first-time tourists, and I'm not sure that I want to spend another $140 and a day to get another visa), but I just wanted to point out that the brand new
Courtyard-in-name-only Puxi is a good value, especially for those with Gold or Platinum status. It is also short walk to the train station from which many of the CRH trains leave.
If I do go, my new hotel preferences are Marriott or SPG.