22 days in Japan

Hello Daniel san. My son and I will arrive to Haneda airport on March 7th and spend two days in Tokyo. On March 9th we go to Kanazawa and Kyoto, where we´ll stay for four days. We want to see Iwashimizu-hachimangu Shrine in our way to Osaka and stay there for two days. The next four days we´ll be visiting Hiroshima, Mijayima, Onomichi, Imabari, Nara and Koyasan. On March 19th we return to Tokyo and from there we plan to visit Nagano, Nikko, Fuyisan, Disney and Tokyo until we return to Argentina on March 28th. We´ll stay in Japan 22 days. Which pass is convenient for our journey? We think the 21 days JR pass is the best option but perhaps there is a cheaper/better option. Thanks in advance. Adriana