Personally, I have no problem with incorporating those two items, actions to date and previous plans, because we have to learn from the past if we're going to improve in the future.
On the auditor, I don't think you need two hours. I personally discussed this with her, and you did too. A lot of people discussed this with her. By a simple amendment, it's very simple to make it acceptable for her and her team. If we're going to spend two hours and then change a sentence in two seconds for that, we will have wasted a whole session.