3 weeks itinerary

I�fm planning a 3weeks itinerary (28mar-20April) for me and my hubby.Will be arrive and leaving at Narita airport. Please give your advice & comments on the following plan:
Day 1 (29mar): Bus to lake kawaghuchigo (using the fuji hakone pass)
Night at kawaguchigo
Day2: kawaghuchigo to hakone (night at hakone)
Night at Hakone
Day3: half day in hakone
Noon: train from hakone to nagoya (start using JR rail pass)
Night at nagoya
Day4: all day in Nagoya
Noon: take train to takayama
Night at takayama
Day5: All day in takayama
Night at Takayama
Day6: shirakawago
Night at shirakawago
Day7-8: kanazawa (2nights in Kanazawa)
Day9-15(7nights): Osaka base (day trip to Kyoto,nara,himeji,kobe,Hiroshima)
Day16-22 (7nights): Tokyo base (day trip to Nikko,kamakura,yokohama,Tokyo)
Day 23: fly back to AUS

The Fuji Hakone Pass might not pay off, since you do not return to Tokyo. The rest looks good to me.

Day 1 (29mar): Bus to lake kawaghuchigo (using the fuji hakone pass)
Night at kawaguchigo
Day2: kawaghuchigo to hakone (night at hakone)
Night at Hakone
Day3: half day in hakone
Noon: train from hakone to nagoya (start using JR rail pass)
Night at nagoya
Day4: all day in Nagoya
Noon: take train to takayama
Night at takayama
Day5: All day in takayama
Night at Takayama
Day6: shirakawago
Night at shirakawago
Day7-8: kanazawa (2nights in Kanazawa)
Day9-15(7nights): Osaka base (day trip to Kyoto,nara,himeji,kobe,Hiroshima)
Day16-22 (7nights): Tokyo base (day trip to Nikko,kamakura,yokohama,Tokyo)
Day 23: fly back to AUS


I would withdraw the Osaka base from there, and instead stablish a base in Kyoto, because Kyoto really is the main atraction, not Osaka. Instead, do a day trip to Osaka and stay in Kyoto for 3 days at least. I would do the effort to include a trip to Hiroshima with a night there; because you can hardly do in only one day from Kyoto/Osaka the two main activities in Hiroshima; Go to Miyajima and the Memorial Park; instead, before going to Tokyo, get to Hiroshima for 1 night; you can spend the first day in Hiroshima (having left Kyoto in the morning) visiting Miyajima; either sleep there or in Hiroshima, and then next day�Ls morning visit the memorial park and head in the afternoon to Tokyo.
If you want to save one day while in Tokyo; you can really visit Kamakura and Yokohama in the same day if you plan well. Tokyo itself deserves at least 4 or 5 days. I would maybe skip the visit to Kobe, because there�Ls nothing really interesting there. So you can save another day there.
And I would definitely buy a 21 day JR Pass. :)