Sorry -- I kinda lost track of the "written" part of guidelines. Loss of focus and forgetfulness are features of my particular malfunction.

I think your new guidelines look good. To me, they show concerns for the individual and a safe, confidential route for individuals with triggers to follow while also providing general category warnings, requesting overviews, and stating behavior expectations. It looks like you've got it nailed down fairly well. I can see where you're coming from with wanting to use "squick," which is such a wonderful fit for some of what you're saying, but I have to agree that it's also a very fandom specific word. Shame it never caught on anywhere else.

I hope this all works out for you and your group!