Try ice packs--20 minutes on, 20 off several times a day. Sometimes they relieve inflammation much more than heat. I always try ice first and then alternate ice & heat.
And, anti-inflammatories do help - I use Aleve. Magnesium helps all sorts of muscle spasms, too. Take orally (I use a combo pill that has calcium, too) and/or try an epsom salts bath.
I also recommend the chiropractor, acupuncturist and massage. Whichever works best for you. Try sleeping with a smaller pillow or use a rolled up bath towel to support your neck.
If you have sharp pains, numbness or other strange symptoms, do see your doctor. You could have a pinched nerve or herniated disc or something that needs medical attention.
Good Luck! I hope you feel better soon