I got my husband's ticket changed this morning, so he is also avoiding PVG. All that baggage claiming/rechecking, immigration, security, etc sounded a bit too much for us old folks. So glad we are now travelling through Narita instead. We know Narita very well, and know that it is a smooth transition from arrival to departure.