Great tips!!
I have a further suggestion which has worked for me. These include a series of neck exercises. I do each exercise 10 times,and they include turning your head from side to side, tipping it from side to side, tipping your chin up and down, followed by neck rolls in both directions. Finally shoulder rolls, individually, then both together. Follow with a further session an hour later if headache is still niggling
I know it's probably not suitable for everyone, but it works for me. I can literally hear the crystals crackling in my neck with the neck rolls, and feel the muscles relaxing.