I had quite bad impingement from months of poor exercise selection at the gym. Changed the routine to be balanced internal/external rotation, did 1/2 above 1-2 times a day. Took a few months but now it’s completely better. I still do the stretching as a prehab now.