headache cures

I seem to have had a relatively constant tension headache for the last couple of weeks, with no prizes for guessing why. While I'm confident it's nothing sinister, it's been going on long enough that I'm not happy to keep taking painkillers (because in this situation they tend to make it worse, causing a 'rebound' headache). So far the main thing that works is scalp and face massage ie. pushing really really hard on various points, which gives a 'relief' relaxation feeling.

Does anyone have any other symptom relieving suggestions?