Hello, I was wondering if I could get some much needed advice on my itinerary. Here is my itinerary :

Day 1 Osaka
Day 2-5- Kyoto
Day 6-7 Kanazawa
Day 8 Takayama
Day 9-10 Nagano
Day 11 Nikko
Day 12-16 Tokyo
Day 78 Hakone
Day 18-19 Shizuoka
Day 20 Tokyo
Day 21 Osaka

My question is whether I should I go for #1 or #2 :

1 : Get the 7 day JR Pass and activate it from Day 6 ie Kyoto - Kanazawa - Takayama- Nagano - Nikko - Tokyo

2 : Get the JR East Pass and use it for Kyoto-Kanazawa ; Kanazawa-Takayama ; Takayama - Nagano ;

Nagano - Nikko ; Nikko - Tokyo

Or do you think I can improve on my itinerary ie plan a more efficient travel route? Thank you for any advice you can give me.
Lee