In my experience NRT upgrades are much easier. I've never missed an upgrade to/from NRT, but am about 50% to/from HKG. I'll even book a stopover in NRT sometimes to save a few bucks and get the upgrade rather than flying coach direct.
I would book something that has current R inventory so you can confirm the upgrade now (assuming you are flexible with your dates)