I have a similar problem. FAI in my left hip. I was diagnosed with that about 3 years ago. A little over a year ago I went back to the doctor and was diagnosed with arthritis and was told that surgery wasn’t really an option as the joint has deteriorated past the point where fixing the FAI would help. I work with a PT and sporadically with a trainer to control it. I don’t have full range of motion (I can get to about 90 degrees).