I've got a quick thought or two. Try stretching your upper back and neck before bed and consider using cold or hot compresses. More importantly I think you need to take a careful look at your sleep. Do you sleep in a position that irritates your neck (maybe a different pillow could help)? Do you have good sleep hygiene? (i.e. not exercising, eating, having caffeine, drinking significant fluids or doing other stimulating activities in the hours before sleep).
Considering that you say that your headaches and soreness occur when you wake, again, my first hunch would be that sleep problems could be setting off your preexisting problem.
DX: NDPH, Recovered(?) CRPS
RX: Lamictal, Namenda, Wellbutrin XL, Oxycodone, Oxycontin, Concerta (Methylphenidate), Clonazepam, Rozerem, Magnesium (1200 mg/d), Riboflavin (400 mg/d).
PRN: Ketamine nasal spray
, Toradol IM, Celebrex, Haloperidol, Lodine, Zofran, Phenergan, Ambien CR
rarely: Migranal, Thorazine, DHE IM, Droperidol IM, Reglan, Provigil, triptans (Imitrex, Maxalt, Relpax, Zomig, Axert, Amerge)I can be contacted personally via email at firstname.lastname@example.org.