I had something similar. I too went and got a really good deep tissue massage that focused on my neck and shoulder. It hurt SO MUCH, but in the end helped a lot. I followed up with frequent heat on my neck and shoulder for a few days and it mostly went away.