For O/D I would definitely choose SHA because it is closer to the city and it is also a gigantic high speed train and subway station. For simple transit I prefer PVG, but SHA is still ok if flight time or equipment is better.