Guitarz if weather is OK and you can get to do night cruise on Huangpu River then the view of the Bund on return simply SPECTACULAR.

I assume the old jazz players stlll plying their trade in Peace Hotel - this is also a spectacle you should enjoy even if only for a short time.

All tourists want to spend a few hours on one of the fake markets - hell I have been to SHA 1,000 times but still found myself in 580 Nanjing West Rd last week as I needed a second bag to cart my crap home.

AS also mentioned Maglev a must at least once.

Accom is easy part - check Sofitel Hyland for 2 reasons - location can't be beaten and they do have good weekend deals which give Exec Lounge access - not best hotel but within your price range and you can get those extras maybe.

So many things to do - such little time.