I am really liking the Kinesis Advantage.
People say about the M: I love it, it's fun to use, it is durable, well built, and manly.
People say about the Kinesis: this keyboard saved my career.
After another episode of pain recently I am back on the Kinesis, typing home row in Colemak (at about 20 wpm...) It is very comfortable.
I am optimistic that this is the answer. Time will tell.