Have the other person apply for cards as well...fly in Y so you'd have enough already if time is a factor. A lot depends on when you need to go, how flexible your dates are.

If you have the time I'd stay longer in Japan, there is a lot to see beyond Tokyo (which isn't to say Tokyo isn't great!).