OK, I'm not completely annoyed at the author yet.
The MC is indeed back under the charm, but he still has memories of the fight and realization of his weakness to... "status effects".
He fails to understand why he was fighting her (not realizing that the question itself is backwards), but he does take lessons from the fight anyway.
I still think this charm is a cheap writing trick, but it didn't change him totally this time.