Didn't see this question before I answered your other one. I agree, if those were my only choices, I'd probably choose to suck it up and head over to Hongqiao. With a 2:30 pm flight, you'd get into Shenzhen about the time the PVG flight is taking off. PVG is no great shakes to hang out in for that long.