Hi, my P2 has a 24 hours layover in Tokyo this weekend:

CX Arriving HND 1345 Saturday
hotel in Shimbashi
CX Departing HND 1600 Sunday

Not sure about immigration queues at HND so booked the last slot at a standing sushi bar near hotel for 20:15
https://tabelog.com/tokyo/A1301/A130103/13256255/
If there's time try/rent gear at ASICS MaRUNouchi and do the 5km Koukyo (5km 25min)...carb loading should be the night before and not after the run...oh well...

Sunday booked the JAL sky museum/hangar tour for 0945-1140
https://www.jal.com/ja/kengaku/en/info/
I should have booked the 1045-1255 tour as P2 could then store their bags in HND, do the tour, retrieve bags and check in for the CX flight...
Stuck with the 0945-1140, if P2 were to store bags in Shimbashi hotel and retrieve it after the tour, they get back to Haneda just before 13H. Or they store the bag in Haneda anyway and find something to do there between the tour ending and CX check in opening. Neither is ideal whoops.

Looking for tips to improve my not so good planning...

Thank you!