I had been thinking about a transit in PVG, so thanks to the OP for the heads up. Unless it's the destination, sounds like NRT, HKG or SIN should be picked for hassle-minimising transits...