L or G for 21h 15m layover at PVG

Hi,
I'm looking for some specific information that I could not find else where.
I'm Indian citizen and currently living in Canada as a Permanent resident.
This year end i'm planning a trip to India YWG-YVR-PVG-DEL. My flight has a Layover of 21h 15m at PVG.
I'll be accompanied by my fiance who is on a work permit here. What is the best category for us to see Shanghai?
Second, the remaining validity on my Indian passport at that time will be less than 4 months. Will I be able to apply with such short validity?
Could you also please tell where I can apply and what all documents will we need.
Thank you