A normal inspector would not make you upgrade everything to current codes... if you are not changing the branch circuits that now require AFCI, then you don't need to add the AFCI. But given your experience with this inspector, I would say you need to be prepared for anything. 