I have the same flight as OP arriving at 12:57am from YYZ. My connecting flight to PVG isn't until 11am. My plan is to rent a car from National to drive around. However, they close at 1:30am so I'm worried I won't make it. Any suggestions as to my backup plan?