I had issues with my shoulder for years. Tried PT as well as pull/push-ups but doing that made the pain worse (if I wasn't doing any exercises involving the shoulder it was "fine")…
in the end I went with the surgery and now I'm in recovery. Sadly 4-5 years of trying lots of PT/streaching/pull-ups/push-ups/whatnot didn't help and only made things worse :(