@Blue I agree with you that Harleep is not an apt or strong comparison. It's an entirely different thing imo. I wouldn't compare them.
Given there are also players on here, on both sides, even, saying the kisses themselves are triggering, if we're speaking of a toggle, would it not make the most sense to toggle kisses themselves? Make it hurt in dialogue leading to the patch 7 kisses, be gentle on dialogue leading to the patch 5 kiss? Just throwing that out as a thought.
I'm with you with this idea. Also because that kiss from patch 5 has been put back into AA in the new evil endings, so I don't see why it couldn't be an option in kisses as a consequence of choosing "be gentle". It's a kiss that AA had for a long time before patch 6 anyway.