Has pre-pay data plans improved in Japan now? Should I get a KDDI prepaid data SIM at Haneda when I arrive?