If you do wind up in Tokyo, I'd also recommend the Nakano ku Aikido Renmei headed by Koyama Kenji Shihan. I used to be a member of the Honcho dojo (they have 4 dojo in Nakano ku). The dojocho is Nojima Masao, 6th Dan, he was originally a student of Tanaka Shigeo, and a member of the Yoshinkan before joining the Nakano ku renmei.
He's great to train with. very solid aikido and very martial