This all became a moot point as with the grounding of the 787s, UA took the 747s that normally service HNL-NRT and re-assigned them to the mainland flights from SFO, LAX, DEN. As a result I am now flying on a non-upgraded 777-200.
With today's news of the FAA approval, UA will put the 787s back on the schedule in early June, which would in turn put the 747s back on the HNL-NRT route. Alas, my flight is in late May.
Equipment changes are brutal!