Hey Danny,
Just a thought. Like you, my second hip started having problems about two years after my resurfacing, so its been having problems for about four years now. While my range of motion is suffering and it wakes me up at night, I can still ski all day and play tennis for hours pretty much pain free so I am not ready for surgery.
My thought is about injection options. I have talked to some hip specialists who feel that cortisone is really bad for hips, and may hold back the pain at the expense of more rapid deterioration of the joint. Their feeling is that it is an option for trying to knock back the pain in a hip that is already shot, if for some reason surgery needs to wait awhile. Another injection option that might not risk further damaging the joint might be PRP (platelet rich plasma). I have been doing a lot of research on PRP, and have become very interested in its potential. Before the start of this past ski season I had a PRP injection, and it got me through the ski season pretty much pain free. I have been impressed by the studies, so I just had another PRP injection into my hip, and my wife and I just had them in both knees in hopes of keeping our 63 year old knees going strong. A recent MRI study out of the Hospital for Special Surgery in New York showed that in many cases PRP stopped the progression of arthritis out to at least one year after the injections. The goal with PRP is not necessarily to stop pain and inflammation, but to create an overall healing response in the joint.
Between the dysplasia and the FAI, it may not be a good long term solution for you, but if you are looking at injections, you might consider PRP versus cortisone.
When its time, I know that you have a great surgeon, so you will be fine in the long run.