When I was there, they sold certain 10 ride bunches (I think the distances were also limited, but yet cheaper than bying every one extra)for some companies in the vending machines, and since I also walked a lot and often changed my mind, it was pretty helpfull. I never used any kind of pass, also because I was kind of on and off in Tokyo, thus never even asked.
Nice to know, there are other regulations now.
Yes, and the locker situation is relatively easy, one was and surely still is a big area for all sizes in the back of the central Tokyo station, also for more than one day. I used it a lot!
Smaller ones are even around many other stations (particularly at cross points or important locations around), or with also local traffic ones, since there are often market centers or the like around. Very convenient indeed.
In many other bigger cities the situation is pretty much the same.
There is another possibility, that we successfully tried several times: some Shrines or Temples had nothing against our kind question to leave our things there in the reception or the like for a while. In Korea it was also the habit and very nice, when you are travelling just for sightseeing from one place to another one. So we tried also in Japan, with success! Its wonderfull, saves you forwards and backwords just for your bags, and yet you can do the visits with empty hands, while your bags are in safe hands.
It also helped during big and small festivals! They never minded and were always friendly.
Give it a try and maybe additionally spread a few nice little presents. Then you will always be welcome again.