Hey bro thanks for the reply, incidentally I actually injured the shoulder doing BJJ, and my dumb ass continued to train for a few a more months (this includes boxing too) until I finally went to a ortho and he told me to stop everything for 3 months.
I've since went to another ortho who told me it was a cartilage tear. Overall my shoulder feels better though but as you said nothing like before.
On a side note when you do certain movements do you hear clicking and other noises with your shoulder? Best of luck.