I'm still holding out hope that Japan will open by the end of the year...
That said, I believe overnight connections in HND are possible so the 17 hour would be valid, just uncomfortable when the lounge closes overnight. NRT is the one with the no overnights allowed.