Been down a similar road with my left shoulder. I was too stubborn to go get it fixed, and lived in misery for way too long.

You'll be glad you got it dealt with right away.

Good luck on your hunt, and with your surgery.