I encourage PVG. Very interesting city. Check our whether this is current, but I believe you can even avoid the china visa rules if you are in transit with an outbound ticketfor a period (It used to be 72 hours). That said, do not toy with the visa rules or you will be put on the next flight out.