Might want to look into luggage storage in Haneda if the itinerary works for you. I filled up a carryon of goodies and left it at one of the facilities. Picked up on my transit/return to US. Had to enter/exit immigration which caused a glitch and required manual processing.