Help with a 2.5 week trip

I’m planning a 2.5 week trip for May, for a first time visit, and need some help on the final leg. Currently we are staying 2 nights shinjuku, 5 nights Kyoto, 2 night Osaka, and 2 nights in Kanazawa. The last 6 days I planned on being in Tokyo and sprinkling some day trips in. I had two main questions. 1 is that too much Tokyo time even with day trips? Should we spend a night or two elsewhere? And 2 since we plan on doing day trips is the best area in to stay in Tokyo for the last leg to have easy access without a lot of transfers to other places Shinjuku? I’ve scoured online and not really found anything too helpful. Thank you for any advice!