Locking and clicking shoulder problem?

I have seen my GP as well as a surgeon about my shoulder and I have 2 options. 1. I have intrusive surgery to fix the problem 2. I have something similar to a Cortisone injection. I'm 22 and play a lot of rugby and the new season is starting soon. I'm not bothered by recovery times I just want a little help in choosing the right option for myself long term