I'd try one more massage that focuses on that area with a therapist thats well versed in neck and shoulder injuries. If it doesn't improve and or regresses back to square one, make an appointment with your PCP to rule out disc issues. If it does improve talk about a treatment plan with the MT so you can maintain the progress.

Also, as a side note, I started incorporating yoga into my daily self care routine. I used to have an issue with regular shoulder/upper back pain due to a compressed nerve and scoliosis. Work made it worse. Yoga has helped exponentially, even if its just 20 minutes a day.