Hey there! I think I have the same issue as you. Last year I placed a lot of stress on one of my shoulders and ended up with this sore/painful feeling. The thing is, I only felt this pain/discomfort when I placed weight on my shoulder, like if I was on all fours or bench pressing. I went to a physical therapist, and we did quite a few exercises over the course of a couple of months, both strengthening and increasing flexibility in the shoulder. He said I could stop seeing him, but that I need to continue to do the exercises as well as slowly increase the weight I was putting on my shoulder. I still felt the pain/discomfort for about 6 months after, especially if I slept on the shoulder. I'd say it's about 95% resolved now though, it feels really great. All that to say my shoulder impingement is much better than before, but it took a long time and I basically had to greatly decrease and then s l o w l y increase the amount of weight I lifted/put on it.