You must stop on Osaka as well. Food capital of Japan, lot of street food and fun night market in Dotunburi.
You could spend months in Tokyo and not see all of it, so yes, absolutely go there, and stay in different parts of town for a night or two each. Akihabara, harijuku, asakusa, ikebukoro, man - it’s endless!
As for Kyoto and Osaka, they are about 40 minutes from one another by train, and if you only plan on visiting these main cities, then it doesn’t pay to get an unlimited train pass. However, if you want to see Sapporo and Hokkaido, and you wanna shoot down to Nagano and Fukuwaka (northernmost and southernmost destinations) the unlimited weekly train pass makes sense financially…
Just understand that one trip to Japan will never be enough. You will need to return in the future, but exchange rates should still be favorable now, it’ll be more expensive later.
Add JackRoad in Nakano to the must-visit destinations in Tokyo for you.
This is Non-negotiable for a watch lover.
Got myself a travel watch case there. 