If you're looking for a medication which isnt habit forming, Atarax, 50 - 100mg 3 times a day, might be helpful.

I take Cipramil 20mg in the morning every day, and have Atarax on had to take "as needed"

I also have some Valium for especialy bad days, but havent had to take one literaly for months