Muscle spasm in my neck still causing pain and headaches?

About 10 days ago I yawned while hunched over in my car and got a muscle spasm in my neck. I went to the ER the next day because it hurt so bad. The Physician said I had a "significant" spasm along the side of my neck running into my shoulder. At that time he gave me Toradol (sp.) and prescriptions for Vicodin, Flexeril and Naproxin. The Vicodin and Flexeril are now gone and the Naproxin helps only slightly. I thought it was getting much better, but now the last couple days it's been hard to sleep again and hurts, causing headaches. Anyone dealt with this? Any good ways to help the pain? Should I see my family physician or will this eventually go away on its own?