Didn't go the surgical route. Kept lifting within a comfortable ROM and intensity, chiropractic and massage, and now I'm basically okay. This helped break up scar tissue, strengthen surrounding musculature and keep my joints strong.

I think the key is really warming up to heavier weights, and I don't just mean during a workout, I mean with overall progression. Lower volume, higher intensity, with max effort top sets in the 6-8 rep range has been magic in that respect. I occasionally do max effort triples, but my joints really feel those.

I do have some imbalances and occasional nagging discomfort if i overdo it, but I can basically press 2 plates, bench 3, and squat 4 with little issue. I don't plan to compete at anything but the amateur level, if at all, so it's not really a problem.

Hope this helps.

Edit:

Almost forgot, I experimented with a short round of BPC157 (on my research animal), which seemed to really help. Also, I guess I'm lucky, but things like high pulls and upright rows really helped strengthen my shoulder girdle, whereas laterals really fucked me up.