I'd give Cissus a try. While most studies support bone/fracture healing, there is the possibility for joint/tendon repair as well. And a plethora of anecdotal evidence out there. Additionally, it is highly anti-inflammatory which may aid in discomfort, as well as a mild pain reliever.
One of the most notable studies showed a 31% reduction in pain from baseline for exercise related pain in healthy men. The effective dose for this study was 3200amg daily for 8 weeks.
Anecdotally speaking, effective doses for most are 2-4g per day in separated doses. Cissus standardized for 40% Ketosterones tends to be more "anabolic" while that standardized for 20% Ketosterones tends to aid more in pain relief and repair.
Cissus does havethe potential for muscle relaxation (at around 30min after ingestion). So technically, avoiding pre-workout would be best, but I've never had an issue when used pre-workout. In fact, there is a thing called the "cissus pump" so you might get a nice pump after about 2 weeks of use.