Tokyo's free WiFi is unreliable. A travel SIM or pocket WiFi rented at the airport is well worth $30–50 for a week.
Mobal, Sakura Mobile, and Ninja Wifi are tourist-friendly options. Many can be reserved online and picked up at Narita/Haneda.
Subway WiFi exists but requires registration each session. Tedious. Just get a SIM.