Hah! Amazing! Almost the same issue. You are so lucky to have a doctor who caught this problem, many don’t, and I think it’s an extremely common undiagnosed problem. You make your own luck though ;-)
You can give yourself massages the whole neck, minus the jugular vein, so from the side to the back. The muscles that connect the neck to the shoulders too and also your shoulder blades and shoulder pressure points with a tennis or lacrosse ball. I’ve almspt fully healed this way.
I got soooo much better after I totally quit caffeine. I still indulge about once a month but I always regret it.