You can try trimming her whiskers short. It sounds more like she's trying to be dominant, not so much angry. As for spraying, and I know people will spazz about this, but I keep a small spray water bottle nearby for really bad sprayers (which, thankfully, I don't have very often if at all)...