Some thoughts on Beijing:
View Beijing visit notes in a larger map
And on Shanghai:
View Shanghai visit notes in a larger map
You’ve seen this already, but here’s my photos:
I’d suggest considering a trip to Hangzhou from Shanghai (1 hour ish by busy, efficient, cheapish train) for the day, or stay over. It has a pretty lake. And apparently the trips to the tea growing areas are a nice day out.