Which pass is suitable for 16 days trip?

Hi, I am planning a trip to Japan from 25 March to 10 April 2017. I need some help in deciding which pass would best suit my itinerary below

25 to 28 Mar : Arrive in Tokyo Stay 4 nights Plan to take a day trip to Nikko.
29 -30 Mar : 2 nights in Takayama. I am thinking I could stop by Matsumoto for a few hours enroute from Tokyo to Takayama by train , then travel by bus from Matsumoto to Takayama
31 Mar - 1 Apr : Bus from Takayama to Kanazawa. Spend 2 nights In Kanazawa
2 - 5 Apr : Train from Kanazawa to Kyoto and spend 4 nights in Kyoto.
6 Apr : Train to Uji from Kyoto, spend a few hours in Uji , then train to Nara. Overnight in Nara
7-9 April: Train from Nara to Osaka 3 nights in Osaka, I plan to take day trips to Yoshino and Himeji (if time permits) . I am leaving from Kansai airport on the 10th April.

I am not sure if the JP rail pass will work for my itinerary. I have also looked at the 5 days Takayama-Hokuriku Tourist Pass but don't think that will work as the pass starts from Nagoya to Takayama. If I skipped Matsumoto and go from Tokyo to Nagoya, I don't think I would save much as I will need to buy the train ticket from Tokyo to Nagoya in order to use the Takayama-Hokuriku Tourist pass.

Thanks for your help!