On final stages of itinerary - need Kanazawa help

2 week trip with wife to Japan first time. First 2 weeks of May.

Fri 2nd night land 630pm - Osaka

Sat 3rd - Osaka

Sun4th - Osaka

Mon 5th - Himeji + Kobe (sleep in Osaka)

Tues 6th - Kyoto (through Nara)

Wed 7th - Kyoto

Thurs 8th - Kyoto

Fri 9th - Kanazawa

Sat 10th - Takayama (half day trip to Shirakawa - 1h bus ride).

Sun 11th - Kanazawa

Mon 12th - Tokyo

Tues 13th - Tokyo (Day trip Kamakura)

Wed 14th - Tokyo

Thurs 15th - Tokyo

Fri 16th - Tokyo

Sat 17th - flight at night 1030pm from Tokyo

Takayama is a bit of an awkward location. Does my 9th-11th idea seam feasible? Should I scrap it and make use of time better elsewhere. We debated Kaga and Hakone as well into the whole mix. Takayama would give us that ryokan experience I suppose. What do we think? I hope I left enough days for Tokyo!