I'm also episodic and a right side sufferer.  When I get the "pain in the neck", like what you're describing, it's usually the result of a lack of quality sleep.  For me, I try for more sleep time or to squeeze in a nap. 

There have also been times that a cold compress on the head, not the neck, on the usual headache side will give me some relief.  When I'm in the middle of the attakcs and more sleep isn't likely, I try the compress and nap together.

Good luck through all this.  I hope you get some great ideas.