I was going to suggest Risperdal myself, as I was initially prescribed it for self-injury and anxiety, but I take it daily. However, my pdoc has me take an extra .5 mg when I'm really "edgy," as he likes to call it, and that's enough to calm me down. Never having taken it solely on an as-needed basis, though, I don't know if that might work for you.

Candy