The trip to Tokyo went well. I think John had a great time. The flights were tough, but only because he was happy and making a lot of noise. That is a lot better than crying or breaking down out of frustration. He loved all of the trains, the noodles, Disneyland, etc. Overall we had a great trip.
Here are some pics:

Tokyo Disney Sea

Shibuya

Enjoying an ice coffee at McDonalds

Roller coaster at Toshimaen

Anpanman ride

Easting some noodles at a shop in the Ikebukuro train station.

Leaving rainy Portland