Where are you staying in Shanghai? I know everyone loves the Pen but if I went again I think I might try somewhere else. The rooms are nice - we had a corner river facing junior suite which had a bit of an odd layout - a bit of dead space between the room and the bathroom which meant a long walk in the middle of the night. Of course the room was beautifully furnished and the bathroom was well appointed but I was very disappointed in the lobby area - nowhere comfortable to sit and people watch - one of my favourite activities. It was more of a mini luxury shopping mall. Service was a bit hit and miss. I'm not a fan of the Davi toiletries - maybe the top suites have something more luxurious which smells nice.

A good idea to have a club room especially for your first few nights when you will probably be jet lagged. Before we moved to the Pen we stayed 3 nights at the JW Marriott in a suite with club access - this was perfect as we were awake at the crack of dawn and flagging at 7pm. We were up at 5 am a couple of mornings and the only other occupants of the club lounge were a couple from Chicago!

As you mention restaurants in Beijing there's one restaurant I think you must try in Shanghai - Lost Heaven - there's 2 and we tried them both but we preferred the one in the French Concession -http://www.lostheaven.com.cn/outlets-restaurant.aspx?type=restaurant-french
I see from their website there's also one in Beijing.