A quick update after 2 years.
I am doing fairly well, continuing to improve slowly.
Back to full time computer work.

As long as I don't forget to take breaks and do my exercises and stretches, the pain stays at the level where I can ignore it. Though I am never really pain free - there is always a feeling of discomfort in my neck/upper trap area.

Don't know if I ever get back to 100%, but I am pretty happy withmy improvement so far.