Still with the sore neck!

I'm still struggling with a sore neck/back. Its been almost 2 weeks now. REALLY painful this morning, I think I slept on it wrong. Had a massage on Friday and another today - helps a lot, but the pain is still there. I'm not sure what I've done, but it is getting really annoying. Driving is the worst, the shoulder checks and slight head movements associated with stopping, starting, and bumps all hurt. The massage guy says to keep applying heat, keep stretching, don't overwork those muscles and stay away from cold and damp. I have a company golf game next Tuesday, so I REALLY need this to be fixed in the next 2 days - but I don't think I'm going to risk it...