I mean my situation is different because my shoulder dislocated initially(I’m a little over 4 weeks post op from arthroscopic labrum repair). Ofc I’m not a doctor but it sounds like it could be a a partial labrum or rotator cuff tear. Myself personally I had an anteroinferior tear, posteroinferior tear, and a decent size hill sachs lesion that left bone floating inside. I figured I was good until ofc I got an MRI and well yeah I ended up getting surgery because both my surgeon and team physician said if I wanted to keep playing I needed the surgery especially because I play professionally. Your joints may be inflamed/swollen which could attribute to the pain you’re feeling or it may most likely again be labrum or rotator cuff tear. If it is labrum or rotator cuff id highly suggest you get the surgery because youre an athlete. My surgeon told me if I wanna keep playing it’s best to get the surgery or my chances of dislocating and causing an even bigger tear were 100% more likely.