How to get rid of pain and stiffness in the neck?

Hello doctor,

I am a 33-year-old active female. A few days ago I went for a bike ride on a cold morning and I felt pain and stiffness in my neck. It got better in four days so I went for a freestyle swim. It did not hurt after the swim but by the next day, I was motionless. I did my best to stretch and rest for weeks but I did continue to bike two to three times a week, just a slow pace up hills. It has been two months and I have a much better range of motion (for the past few weeks) but still, I have stiffness and some pain. I avoid Ibuprofen if I can but when I consume it, (only 200-400 mg, one or two times a month) I get a cold. I eat a clean diet and focus on hydration and sleep. I am sensitive to prescription drugs. I have been taking ginger and turmeric two to three times a day for about three weeks. Also, I sleep on a Tempurpedic bed with no pillow, or a neck pillow which does not help. It seems to be the most sore at night because of the lack of motion. I really do not want this neck pain to last any longer. Please help.

Thank you.