Also make sure they document the lifting of your SWU at JFK for the NRT leg. If you do get back on the list and clear, you don't want to lose another SWU by mistake.

Good luck on the upgrade! In my post-UA-bankruptcy travels, there was only ONE instance where I did not clear an upgrade, all others clear as late as boarding, and as early as booking (yes, still happens!).