I'd personally spend the whole time in Tokyo as it's such a massive city and there would be so more to explore and discover that you would never not become bored as there's just so much fab stuff to take in all around you and never a dull moment in sight...as far as I'm concerned, it's one of the best cities in the entire world