Annoying shoulder pain

Hello everyone, I've decided to post this on here today because I just wanted to get a few opinions on what my problem could be.

Basically a couple of years ago I slightly injured my shoulder doing dips, and the pain went away naturally. I took a long time off training (approximately a year) and I discovered street workout. During my little journey doing street workout I began developing pain in my shoulder again when I learned the muscle up (with a lot of kip) and it irritated the hell out of me. I looked up what it could be and found a 101 different issues it could be all revolving around my rotator cuff, from a self-diagnosis. It feels like I've hurt my supraspinatus?? Now my issue here is, I've had this problem for 2 years and it's preventing me from working straight arm elements, particularly hand balancing straight arm moves, the top of a handstand doesn't hurt, planche leans can hurt, if I try to pike my hips on paralettes as if I'm doing press to handstand, the same place on the front of my right shoulder really hurts... And no matter how much I rest it, it never goes away, it clicks a lot also. And just recently it's been hurting a lot more. I just wanna know your thoughts and opinions, because one day I wanna be able to planche. And it looks like that's never going to happen if this problem is one of those ones that won't go away without surgery.

See a physical therapist. I spent six months looking for advice and piecemealing together micro solutions and mini-stretch routines from the integrated mobility elements within foundation series to fix the issue. It turns out what I was fixing wasn't even actually the issue at hand (there are about a dozen muscles in the shoulder and all of them are needy little bastards). Also, vet the PT. If you don't think the one you see is on the money or up to snuff with their analysis then visit another PT until you find one who offers up satisfactory advice. Going it alone and sticking to that will not resolve the issue, no matter how much help these forums or any google search seems to be. There is little that the forums can provide you without in-person, hands-on exposure to what ails you. I learned this the hard way and after a year of "dicking" around I finally got to a PT and I'm still early days on to fixing years of likely fascial adhesions and the damage of poor posture (but better late than never). Best of luck on your road to recovery, hopefully, it gets better before it gets worse.