I know this may not be what you are expecting, but I would recommend minimal upper body exercise. Walking is perfect. I would also try cycling through different classes of NSAIDs, starting with ibuprofen.
Also consider low inflammation diets, and especially reducing inflammation with natural fruits, enzymes and other supplements. Working on your gut health will also help.