I’d only stop in Tokyo for the day, and continue up the country to Hakodate. The weather will change, there’s near no tourists and you’ll see a mountainous part of Japan that’s completely different to where else you’ve been.

Then on the last day that you fly out, go back in early - hit up whatever it is you’re going to Tokyo for (it’s not what it was in the 2000s, you have to search and get recommendations - the tourist trap area is just like any other large metro place in Japan) before flying out.

Get your luggage shipped to the airport.