I have had the exact same problem! My headaches started out as sinus headaches and got worse from there. I finally googled ways to deal with sinus issues and came up with a routine that works pretty well for me.
-hot/cold compresses on the forehead.
-saline spray (to keep the nasal passages moisturized)
-sleep with a humidifier (the ones that you can add vick's to are the best!)
-Sudafed. I take half a 12 hour pill whenever I feel a sinus headache coming on (a full pill makes me jumpy). For a while there the pain was chronic and I had to take one every day but once I started doing the other things religiously the pain was no longer a constant. Sudafed was on the list my doctor gave me as a-ok.
-Sinus rinses. Sounds gross and it is, but it works like a charm. When things are really bad I do it before bed and in the morning, but lately I've been getting by with just one every other day.