Winter itinerary check + rail pass?

Hello, our family (with kids 11 and 10yrs) have an itinerary almost settled. We were wondering if you thought a tweak involving leaving Kyoto a day early to Hiroshima thus freeing up a day (5th Jan) to go to TAKAYAMA (from Hiroshima) for one night before bus (stop at Shirakawa-go) to Kanazawa. Is a night in Takayama worth it? *** Also, can you please advise best rail pass options for the itinerary (incl tweaked itinerary) below e.g. mix of area passes and individual trips or a Japan Rail pass etc?

EXISTING ITINERARY (Option 'A'):
1. KYOTO 29 Dec - 3 Jan (6 nights) [with day trips: Nara, Hikone, Oskaka.]
2. HIROSHIMA 4 Jan - 5 Jan (2 nights) (with stop in Hijemi on way from Kyoto)
3. KANAZAWA 6 Jan - 7 Jan (2 nights) [Possible half day trip to Shirakawa-go..or not?]
4. MYOKO-Kogen/Akakura ski fields 8 Jan - 11 Jan (4 nights)
5. TOKYO 12 Jan - 16 Jan (5 nights) [with day trips: Hakone, Disneland]
6. NaritaExpress ride back to NRT airport on 17 Jan.

TWEAKED ITINERARY (Option 'B'):
1. KYOTO 29 Dec - 2 Jan (5 nights) [with day trips...]
2. HIROSHIMA 3 Jan - 4 Jan (2 nights) (with stop in Hijemi on way from Kyoto)
3. TAKAYAMA 5 Jan (1 night)
4. KANAZAWA 6-7 Jan (2 nights) (...stopover at Shiraka-go on way)
5. MYOKO-Kogen/Akakura ski fields 8 Jan - 11 Jan (4 nights)
6. TOKYO 12 Jan- 16 Jan (5 nights) [with day trips]
7. NaritaExpress ride back to NRT airport on 17 Jan.

Any suggestions, advice on itinerary and recommendations for best transport/rail pass/bus pass option appreciated. Thanks.