Updated Japan Itinerary!

Well, we did some more research and this is what we have:

Kyoto - 12 nights
Kanazawa - 2 nights
Takayama - 3 nights
Magome/Tsumago - 1 night each
Matsumoto - 2 nights
Tokyo - 6 nights

Lodgings have been booked for Kyoto, Takayama and Tokyo. Just waiting for confirmation for the remaining destinations. Still haven't decided on where to stay in Kanazawa. Suggestions?