I mean there are far worse places to go than Tokyo!
I wondered if the old 'departure day upgrade' from Class J to JL F might apply - looks like from the policy side JL don't do it from HND-NGO; it can be a nice way to fly domestically (both hard and soft product are great). I did it once and got the full F status earn to QFF; not sure if that's been enhanced away these days- it was a fair while ago.