These incidents are getting a little more common, as you said, and I don't like it.
I carry in SECU as well, haven't had issues as of yet. I don't usually go in, but I have OCd inside a couple of times without issue.
I'm glad you're pursuing this. Hopefully it will just come down to a little department reeducation, and no legal problems will come of it.
Good luck, keep us updated, let us know if you need help, etc.