Use of JR pass for 21 day trip

Hi, can someone please check my itinerary and see whether I can improve it in any way?
Thank you

13th - Tokyo
14th - Tokyo
15th - Tokyo
16th - Takayama - 6500Y bus from Tokyo
17th - Kanazawa - shirakawago bus from Tamayama to Kanazawa
18th - Kanazawa
19th - Kanazawa
20th - Hiroshima - ACTIVATE JR 7 DAY PASS
21th - Hiroshima
22nd - Osaka
23rd - Osaka
24th - Osaka
25th - Kyoto
26th - Kyoto - JR PASS EXPIRY DATE
27th - Kyoto
28th - Kyoto
29th - Night bus to Tokyo 5000Y
30th - Tokyo
01st - Tokyo
02nd - Tokyo
03rd - Tokyo

Which is the best rail pass for me to use during this trip?

Thank you :)