Improve my Tokyo/Kyoto Itinerary

My husband and I are traveling to Japan in October for the first time, and we couldn't be more excited! I'm usually a VERY detailed travel planner, but sometimes I get so obsessive about the schedule that I forget to enjoy the little unplanned moments that make traveling so fun. So, I'm trying to take a different, more bird's eye approach to planning this Tokyo/Kyoto trip. I want to leave room for exploration.

We are Disney nerds and are trying to visit every Disney park in the world, so I definitely allotted a little time in the agenda for that. I'm also a huge Starbucks person and have made it a goal to visit every Roastery in the world, so that's on the itinerary, too.

Other than that, I'd love to hear what people think of this itinerary. I don't expect to see and do everything in each of these cities in such a short amount of time, but is there anything else we MUST do? Is there any way I can organize the schedule any better?

Thank you in advance!

Tokyo

10/15 Flight to Tokyo

10/16 Check Into Hyatt House Tokyo Shibuya & Enjoy Dinner

10/17 Explore Shibuya & Harajuku (Shibuya Scramble Crossing, Mipig Cafe, Starbucks Reserve Roastery)

10/18 Ghibli Museum & Explore Shinjuku

10/19 Mt. Fuji Day Trip & Check Into Toy Story Hotel

10/20 Visit Tokyo Disneyland 

10/21 Tokyo DisneySea & Check Into Hilton Tokyo Bay

Kyoto

10/22 Travel to Kyoto & Check Into Hotel The Celestine Kyoto Gion

Visit Nintendo Museum

10/23 Explore Higashiyama District (Kiyomizu-dera Temple, Yasaka Shrine, Yasaka Pagoda, Kodai-ji Temple, Gion)

10/24 Visit Monkey Park, Arashiyama Bamboo Forest, & Tenryu-ji Temple 

10/25 – Flight Home

by Bad-Pomegranate