Also, how is Uber/Lyft in Tokyo and Kyoto? Pretty prevalent?

They all filter through their taxi system. Wherever you're at, they'll hail a cab for you.

Very easy to get around.

Check out japan-guide.com as well.

There is so much to do in Japan its awesome.

One of the best things we did, is our first day we had a personalized guided tour where they show up at your hotel and then take you to all the places. It's usually someone who speaks english well, in our case a retired teacher who just wanted to keep busy and practice his english. He took us to wherever we wanted or that they suggested and gave several tips for navigating our visit as a foreigner.

Something more impactful he showed us was how to use their subway system and get tickets, that alone was worth the cost of the tour lol.

Bring comfortable walking shoes!

That's a great idea for the first day, assuming we can wake up at a reasonable hour after the time change. Do you have the name of your guy?

Trip is shaping up to look like this so far:

Days 1-4: Tokyo (hotel in Shibuya or Ginza)
Days 5-8: Kyoto with a day trip to Nara
Day 9: scuba diving
Days 10-13: Tokyo again

I'm in Kyoto now. It's super easy.