Gave up and booked flights to South Korea and North Vietnam.
Will be a great trip but I'm a bit gutted to miss Japan again this year.
My flight to Seoul actually has a stopover for 4 hours in NRT so I'll be in Japan temporarily, broken hearted at not being able to leave the airport.
Hopefully I'll sneak in a nice airport meal at least.