JFK -> PEK layover for 2 hours -> PVG ->KIX: Does it Count?

Hello. I am planning my Spring Break to Japan and thinking about stopping in the Shanghai/Hangzhou/Suzhou for two days before flying into Osaka. Problem is I have to fly through Beijing and stay for 2 hours, and I don't have a visa. If I fly JFK -> PEK layover for 2 hours -> PVG on Air China, am I eligible for 144 or 72 hour TWOV? Also, would I need a TWOV to connect my flight to Shanghai? Thanks!