First time in Japan, 30 days, suggestions for my itinerary

I’m going to Japan late october this year and I’ve been struggling a bit to finish an itinerary. So far I have a basic idea for about 20 of the 30 total days:

• 6 days in Tokyo
• 2 days in Hakone
• 3 days Takayama-Shirakawa-Kanazawa
• 4 days in Kyoto
• 2 days in Osaka
• 1 day Kobe/Himeji
• 2 days in Hiroshima

I’d love to have some tips of other interesting places to visit, or even the order to visit all these places.