When I started having problems about 7 year ago, I did a handful of things, but the two that made the most difference were:
Better chair (Aeron). Sounds odd, I guess, but being the right height and having good posture makes a difference. I also dropped the arms way down, so I simply cannot lean on them no matter how lazy I'm feeling (among many other pains, my left elbow had a permanent twinge of pain, which still pops up now and then, but was always-on back then).
Tiling window manager. This assumes UNIX/Linux, but it made a difference when I almost completely killed the mouse from my life. If typing is more painful than mousing for you, this might not be the right choice. It helped for me, though...I immediately was able to work full days again due to this change, though I don't know if it was therapeutic...it may have just avoided the most serious pains.
Other things that may or may not have helped, but I did them while recovery was clearly happening:
Changing positions frequently. Keyboard slanted/flat. Raising and lowering the chair. Occasionally sitting in a different chair or on a ball or standing. Getting up and walking about a lot.
Exercises that encouraged blood flow to the affected areas. Cardiovascular exercise in general, but tennis and such were my focus. You've already tried swimming...so that's probably in the same league for circulation. I wouldn't quit doing those things, even though they haven't resolved your problem...I doubt they're hurting.
I cut back dramatically on playing guitar and piano, since they incurred very similar sorts of repetitive stress. This one was not pleasant, but now I can play again without any problems.