Also, I forgot to mention that I've quit coffee cold turkey this week and replaced it with green tea at the advice of the osteopath so I've been dealing with withdrawl headaches as well as the tension headaches.

I'm hoping that cutting out caffeine will help in the long run.