Have you tried ultrasound? It's very reliable for muscle spasm and trigger point pain which is likely the cause of your related headache. Home use ultrasound can be used as soon as you have the stiffness or pain. There are a few versions - Sonic Relief comes to mind as a safe and effective brand.