I'd go for option 1.

On a practical level, if you want to upgrade the U.S. -> NRT leg and you're targetting a specific day, I would think the routing would depend more on upgrade availability more than anything else. In my experience, ORD is very hard, DFW can be difficult, LAX or SJC are often easier (and not sure about JFK - haven't looked at it in a while).