Worth waiting for NRT in my view as it's a much longer flight - upgrading one leg has zero impact on you eligibility for an op up.