MNL-PVG-EWR Philippine Passport Holder

I have been reading that there is no airside transfer facility in PVG so I will have to claim my baggage upon arrival via China Eastern in PVG and check it in again in T2 to transfer to the United Airlines gate. I will have 8 to 11 hours layover in Shanghai.
Two questions:
1) If I do not intend to explore Shanghai during my layover - do I still need a Transit (G) or will i qualify for the 24-Hour Direct Transit?
2) If I intend to explore Shanghai for a while during my less than 12 hour layover - what type do i need?
Thanks!