For shoulder pain I did rotator cuff exercises and my shoulder pain went away and stayed cleared up.
Here they are:
Standing Rotator Exercise: using a light dumbbell (I use 10lb or 15 lb), bend your elbow and hold the dumbbell straight up like you are going to do a military press, then rotate your hand forward, keeping your elbow bent, until your arm is parallel to the ground, then raise it back to the starting position. This is one rep. I do three sets of fifteen reps of these on chest day.
Next I do Lying Down Rotator Exercises: using the same dumbbell, l lie on my side with my upper arm flat against my side, then lower and raise the weight in front of my chest, keeping my forearm more or less still. Again, I do three set of fifteen reps right after the Standing Rotators.
That is all I did and my shoulder pain cleared up. If it starts to flare up, I do them for a few weeks and they get better immediately.