If you strain your upper body during the work-outs, you should find a different exercise. Any muscle tension in the upper body and neck can be problematic.

You need to find a specialist to work with your neck. And, maybe a different doctor. Does not instill confidence in concussion skills. Is there a concussion clinic near by ?

Ice on inflamed joints. Heat on spasming muscles. Heat is not good for inflamed joints. It increases inflammation, making it worse. Ice will not help a spasming muscle but it will not make it worse. It is needed to reduce inflammation.