Wow, you are all planned out! I just recently booked a trip a week ago for mid-May and have not even planned one single day out :P
I have been to Tokyo many times, but have not been in about 5 years. I promised myself I would plan something solid and stick to it instead of my usual just go and see what happens approach.
I might have to steal some of your ideas!
