Nice report on the JL leg. I noticed that since I flew JL F a couple months ago the amenity kit was upgraded from an airline-branded one to the designer one. Little things like that make me think that management must have ANA and CX in their sights.
I think that if they made the NRT F lounge into a true F-class lounge, with waiter service, menu ordering, etc., then that would be a big step. I personally think everything else is more or less competitive at this point (within the realm of subjectivity about what kinds of food people like, etc.).