Just to say, arrived in T2 last night, and went to a SIM card stall.
they had a few options but the simplest for me was 4000 jpy for 7 days unlimited data. Unari-Kun sim is what it's called. Seemed to be the best deal, especially for me since I expect to be fairly data intensive.