I went there a few months ago and flying in was much easier with the visit japan thing. You don't need to do the Covid stuff anymore (if it's still on there) but you can fill in the rest and scan the qr codes when asked.
You need this page www.vjw.digital.go.jp and make an account if you have...
Pretty happy to hear the craziness at Narita has cooled off, heading there this week and not super keen to be waiting 3 hours at the airport but we'll see.