Suggest Treatment For Headache And Pain In Neck

I have been having daily headaches with pain also in my neck. It has been going on for months. The doctor thinks tension headaches and Naproxen along with Diazepam does help. But as soon as I stop taking the medicine, it comes right back. They have gotten unbearable and when i push on the area above my eyebrows, it feels bruised. Also on the back of my head.