Yes, your earlier plan is now viable. If it were me, I'd fly from SHA to PEK, but the train is arguably trying at least once if you're into trains (and don't have tons of luggage).