Some notes... I ruined the only pair of shoes I brought to Japan when it rained all day at Tokyo
Disneyland. Look for some waterproof shoe covers if there is rain in the forecast.
I see you mentioned planning to do the war museum (Yushukan) which surprised me as that's not high on Westerners lists. None of the other tourists at my hostel had even heard of it and when I went I did not see another westerner. That ended up being my favorite site in Tokyo as it was just fascinating to me to read their take on the wars from 1850 forward.
Also, something about Disney not mentioned here. The scoring on Buzz Lightyear is completely different. You only score if you hit the bullseye of the target and you can only score off each target once. After a lousy score the first time and some on-ride delays the second time I figured this out.