I chose option #2 via LAX. The change to summer time in the USA and the fact that Japan does not means that the LAX flight arrives 1 hour earlier in April. With 2:20, that should be ample time. And I already have confirmed upgrades on the WAS-LAX-NRT sectors.