An update.
After a 3 week vacation from computer work and regular upper trap TP self-massage for a few months the headaches and back-of-the-neck pains have subsided.
I also have been avoiding any neck-straining exercises.
Still have a bit of neck pain when I wake up in the morning, but nothing too bad.

Unfortunately I am back working on computer all day so we'll see how long this lasts...