I have had that kind of shoulder pain right, especially after my surgery. My PT friend suggested stretches for internal shoulder rotation and they have helped - a lot! The "sleeper stretch" was especially helpful to me and there are lots of how-tos and variations if you google it. Hope you feel better!