Thank you all.
We are staying at the Tokyo station courtyard in Tokyo and the shin-Osaka courtyard in Osaka. I'm not so worried about Osaka. I can manage Tokyo station after I take one or two trips through there. It's the first pass through that I'm most concerned about.