Good to hear you are starting to see improvements.
Episode 31: 10 min squat & an Impingement Fix
Episode 78: Un-impinge yourself from mental slavery

Have you had someone look at your technique with pull ups?
You may need to adjust your hand placement if it is too narrow or too wide.
I would suggest the same for OHS.
Your hand placement and shoulder organization could be contributing to the situation.
You want your shoulder pit forward and your elbow pit to the sky
Getting your arm into a better position will start to address the situation.