The symptoms that you are describing now sound more like those associated with a migraine. When you were diagnosed with your migraines, was it while having an attack? What do you take for your migraines, Imitrex? I was looking on the internet and stubled across this website:
http://www.headaches.org/consumer/topicsheets/migraine.html

It says that the pain is typically felt around the eye or the temple area, but can also be felt in the face, sinus, jaw or neck area. This would explain why you have the pain in your neck and jaw area. Hope this helps you and that your headache goes away soon.