Sounds like you have it figured out but worth noting:
Visa Japan is not the same as Visa that we know. I had my Charles Schwab declined multiple times when I was in Tokyo last year, called Schwab on the spot and they saw no records of the transaction ever running.
At that point we both realized it's because the ATM was for Visa Japan only and I had to find a 7/11 that was Visa international.