Short answer check out FAIfix.com and Upright health on Youtube.
I’ve been through an 18m nightmare trying to resolve my hip issues, was diagnosed with FAI, cancelled surgery at last minute as research showed outcomes were poor. Finally had a physio recognise that my hips were very weak and not functioning properly. Followed FAI fix and now finally back training albeit i have to dedicate 2 sessions a week for strength and daily exercises and stretching to maintain my hip.
Good luck