It's official, I'm going to China!

I made my deposit, booked my airfare (surprisingly cheap - only $850), and submitted my Visa paperwork today in person. It's official - I'm going - May 16-31st!!!

Here's my kickass itinerary. So I'm flying in and out of Shanghai and I'm getting to Shanghai 2 days before the program starts in Beijing. Should I fly or take a train there? Any suggestions for what to do in Shanghai/Beijing in my limited free time? Let me know!