Well to update this. Have been using daily doses of Collagen II, MSM, Hyaluronic Acid, Glucosamine/Chondrotin, Boron, Fish Oil and tumeric/curcumin and pain has entirely disappeared.
Switched to DBs for push and all is good. Numbers are starting to creep back up to pre-Covid gym shutdownlevel...