agree basically with dsquared37
OP did not come back whether he/she qualify for a TWOV. the Problem with the TWOV is that you can't predict how long you have to queue. I was once through within less than 5 minutes and once close to one hour.
but even with the 5 minutes you still have to pick up bags change Level and go through check in and security again; and even flying in premium classes does not help as there are only fast tracks in domestic at PVG