Suggest Treatment For Severe Headache

I have voluntarily been dosed with pepper-spray and have since then been experiencing tension-headaches. Anything that required tensing made my head pound and prevented me from intercourse or heavy lifting. Even masturbation results in a call off work. Lots of ibuprofen and caffiene kept it at bay, and I gave myself a week or celibacy and taking it easy, and time seems to have healed me a bit, but I suspect it may also be because I've learned to keep my neck muscles relaxed for the most part. I'm still taking ibuprofen with caffiene but its been going on too long and I'm worried this will never go away. Getting tense just thinking about it, help?