Shanghai - Tokyo tips?

[Anthony]

I leave in a week for Shanghai, and will be going to Tokyo on the 8th of July for 6 days also. Never been to this part of the world, and a bit overwhelmed trying to plan. If anyone has any tips or tricks to share, things I must do in either city (although I only have about 2 days in Tokyo before heading north to see a friend), I would love to hear about them.

Thanks!