Yes, unless something has radically changed since the beginning of the year, the TWOV lanes are almost always separated - especially at PVG (I can't comment on CTU).
The yellow form given on the plane should not be filled out as it is not applicable to TWOV.
TWOV (24/72/144 hour) should fill out the blue form only. This is available adjacent to the TWOV desks. It's a good idea to pick up a couple spares if yuo know you will be heading back to China and using TWOV.