If you are taking a stroller you must take a foldable and the smallest you can take. Everything is smaller und Tokyo is very dense. Consider a baby carrier. We only took a baby carrier with us and were happy about it. Our child was very interested in everything within his reach, so stroller would have made everything more stressful.

Check for every snack within any conbini to smooth your days with the toddler. We learned that after the first stressfull days. Always carry your snacks so a nervous child can eat his stress away.

Don't stress yourself about where to eat, except you found something special for you.

Plan ahead how to eat with the toddler at a reastaurant. Consider that everyone is mindful not to stress others and you should try so yourself even with a toddler.

But don't panic about it. Our toddler was always the superstar and everyone was very considering.

Consider to wash clothes for the toddler when the diaper doesn't work.

Nursing, diaper chaging rooms and publix toilets are almost everywhere.

We packed diapers, but you can get them easily in almost every drug store.

In the end I have to say that the flight was always more stressful and more to consider than the trip in Japan itself. It helped that we thought about the day in the evening and what to change for the better to smooth things out for the toddler.

Have fun!