Lol same as me i already planned second trip before my holiday was over thats how much i enjoyed it over there.
But i strongly recommend you to visit Osaka the next time, i liked it more than Tokyo actually and the food was the best of anywhere in Japan, (except wagyu in kyoto) whatever you do...