April 2026 Trip with 7 last days in Tokyo

We're traveling to Japan this coming April with the following itinerary:

Day 1 - Landing in Osaka and to Hiroshima
Day 2 & 3 - Hiroshima / Itsukushima
Day 4, 5 & 6 - From Okayama visits to Kurashiki, Naoshima, & Teshima Day Trips
Day 7 - Himeji while in transit to Osaka
Day 8, 9, 10 & 11 - From Osaka visits to Nara & Kyoto Day Trips
Day 12 & 13 - Takayama & Shirakawago
Day 14 - In transit to Tokyo
Day 15 - From Tokyo Mount Fuji Day Trip
Day 16 - From Tokyo Kamakura Day Trip
Day 17, 18, 19 & 20 - Tokyo
Day 21 - Take off to next international destination

Question is if is cost-effective buying 21 day pass?
Or is it cheaper to buy 14 day pass and pay for Mount Fuji, Kamakura, Tokyo city & to Narita Airport on the side?

Thank you in advance.
LauLau