It seems surgery isn't all that common. Possibly some PT style stretches and exercises per the interwebs. I believe it was similar in my shoulder. Spurs wreeking havoc. We will see. I am not worried.
Eric, I have had the same problems with c4,5 and 6 for many years now. But I am much older than you are I think. I have found that exercising lessens the issues and the pain.