Hello, I'm doing a Japan trip that will start and end in Tokyo.

With that in mind my original Plan was to do:

Day 1: Tokyo

Day 2: Tokyo

Day 3: Day trip to Nikko

Day 4: Tokyo

Day 5: Hakone/Mount Fuji (with overnight)

Day 6: Quioto

Day 7: Nara day Trip

Day 8: Quioto

Day 9: Hiroshima

Day 10: Osaka

Day 11: Osaka (Universal)

Day 12: Day trip to Himeji

Day 13:

Day 14:

Day 15: Return to Tokyo and Home

This leaves me a couple of days that I don't know exactly what to fill. This could even be three days since probably I would be able to reduce 1 day in Tokyo.

I've been considering Takayama and Kanazawa, but I've been seeing that is a bit difficult to get to Takayama. If I was going to add Takayama, what do you think it would be the place to get there and to go after in terms of time?

What options would you purpose in case I skip Takayama completely? What would you suggest to fill the remaining couple 2 days, 2 days and half.