I hear you about how good heat feels, I still use it for some of my older injuries that flare from time to time. I am no doctor, but I've noted it really helps to use heat in the evening when my neck flares. It seems to help calm things down. I wouldn't do it before an activity however. My old PT would also have me use heat on my neck after a therapeutic session.

+1 on what Oak said about eating clean and getting extra protein and vitamin C, it really helps to make certain your body has the building blocks that it needs to help you heal.