Well, the point that is emerging in this thread is that the interpretation is not up to each of us. MannyB and MBLES are both dealing with inspectors that are saying there has to be AFCI on a simple device replacement, and, evidently (although MannnyB hasn't come back yet) one of the inspectors will only accept the combination type AFCI at the panel, which, in the customer's case will require a panel change out.
MannyB and MBLES seem to be asking for alternatives, and admit that the inspector will be a hard mind to change.
The argument of whether "branch-circuit wiring" or "wiring" or "Premises Wiring (System)" includes or does not include "wiring devices" (Art. 100 Premises Wiring Sys definition), or devices is entirely beside the OPs question.
If the CMP's wanted the wording in "branch-circuit wiring" to NOT include devices they would have said so.
The CMP is silent on the definition of "wiring" and "branch-circuit wiring". Again, there are no definitions in the NEC for "wiring" and "branch-circuit wiring" so we can go on endlessly with opinions, here.
If you read my comments, you will see that my opinion has not changed from other threads and that I agree with your opinion about receptacle replacement. But this thread is about the OPs situation.
If you are working in an inspector's area, and an unyielding inspector says "AFCI breaker only" is required to change out a non-working existing GFCI receptacle outlet device. . . then it just doesn't matter what my opinion on this is. MBLES is asking for "alternatives".