I've had hip flexor/TFL issues for years. For me, core work such as side planks, light yoga, and pilates helps keep it at bay. If I slack on these, I feel it on the bike, or kickboarding.
Google some drills for baseball catchers. They have to work a LOT on their hips and there is a ton of information on the Net about stretching drills for them.