Thought I Had Torticollis.....woke Up 3 Weeks Ago With Neck/trapezius

Thought I had torticollis.....woke up 3 weeks ago with neck/trapezius pain rt side. Several massage therapist appointements, exercise,heat/ice and Dr. putting cortisone shot in it helped.....but still won't go away. Now it itches! I feel it is from strain of sitting at my work desk at an angle for the keyboard/computer screen not being ergonomically correct.