IMO the direct flight is preferable, and nowadays you can be almost sure to have the NGBC on the 777 on ORD-PVG.

Even better if you can upgrade to F.

The only thing you'd miss is the JL lounge in NRT, but due to your 2 PM arrival you can enjoy Shanghai earlier