JFK is MU's flagship route, so you're guaranteed a nice plane, and Shanghai is a much shorter backtrack than Guangzhou. If I were the OP, I would shoot for a stopover in order to justify the diversion, and minimize time spent at PVG. Fly HND-SHA, spend the night in Shanghai, and do PVG-JFK the next day.