* Sit stand desk. Not just for standing: lets you adjust height while seated to ideal level
* Placing keyboard/monitor at proper ergonomic heights to one another. This implies arranging keyboard height then having a separate monitor raised up, not a laptop
* Armaid and theracane. Two wonderful and cheap self care tools for tight muscles. Armaid works the arms, theracane all over but I use it for trapezius
* Handshoe mouse. By far the most comfortable and ergonomic mouse I ever used. Once I got this my remaining troubles vanished
* Trigger point massage. Works out small trigger points and knots that can cause referred pain
* Good physio, especially one trained in muscle activation technique (MAT)
* Herman Miller chair. This seems to help, but basically any chair you are comfortable in is the key point.
DO NOT just work through the pain. It compounds and takes much longer to fix. If you address pain while it’s small and set up right, it is easy to deal with.
I lost months (years?) of productivity to RSI. Take it seriously. Doing great now fortunately.