exercises that are hip-friendly

Options
Okay, so a few months ago, I took part in the relay for life. after about 3 hours walking (on and off) in the cold rainy weather, my hips started clicking, quite badly. The next day I was in pain, and have been on and off ever since. I went to the doctor, was prescribed some anti inflammatories, and recommended to get x rays to see if I had any underlying problems. After a chat with my dad, it turns out I was born with congenital hip displaysia. I am sure this is the cause of my issues (and the 'clicky hips').
I want to find if there are any exercises I can do that will not cause me more pain. Walking is ok, especially if it is on a soft surface, and for less than an hour at a time. I tried running a few weeks ago, and it just was ridiculous.
I have been exercising, practically every day for the last 2 years (although not strenuously), and if I can't keep up some kinda maintenance, I will probably go crazy.
Anything that anyone could recommend? I am considering massage too.
Thanks!