ANA!!
I flew ANA to NRT and it was amazing!!! I flew in first class going there, with 33 inches of width!! The seat was huge!! Business class was also outstanding. The serivce was great, and they are now my preffered carrier to NRT. You can transfer NRT to Shangai, and I am sure that, that flight would be great.
Let us know who you choose.