@evergrn If you end up going with T-Mobile and find that the included 2G roaming is too pokey, you can always add an International Data Pass.

As a long time T-Mobile customer I've done this a couple times when I've visited Japan, particularly when heading out to more remote parts of the country where WiFi is a little less prevalent than a major city such as Tokyo.