I agree that the stop in Shanghai is annoying, but atleast it's only a short stop, and I don't need to change plane or anything. My plans before and after the trip to Tokyo is already fixed, since I'm in Beijing to visit family who works there, but thanks for the suggestions anyway!