Thanks for the input. My ticket on CA would be changeable/refundable, so I am tempted to book the 16:00 flight and make a run for it. I won't have any checked bags so maybe I've got a shot.
I considered flying to HKG instead of PVG, but it is substantially more expensive for some reason.