My resolution has been to use a trackball. Literally resolved all my issues.

Switched to a mouse for a while, 2 months in RSI came back. Trackball it is.