Looks like until 2016, NTT is offering free WiFi to those who are traveling to Japan.
http://www.flets.com/freewifi/spot.html
For the 2015 Japan trip coming up, we will still be renting a mobile hotspot from DoCoMo at the airport.  This is only slightly different from last year as we will be getting the device on site instead of preordering.