Shanghai Urban Planning Exhibition Hall.
Golly, don't miss that.
Much of the itinerary is good, and it's on a well-beaten path that you can do on your own. I'd skip the 4-star hotels and stay at guest houses and hostels where you can meet other travelers and do things together. For example this one in Xian.
I'd also travel by train rather than plane where possible.