How To Treat Hip Arthritis Without Surgery?

I have right hip arthritis and will eventually need a hip replacement. ?I have had two cortisone shots that have alleviated the discomfort. First one lasted over a year second one was done just before Thanksgiving. the problem I have now is my right hip clicks a lot. If I walk or sit, it happens as well as when I exercise. any correlation and what can be done without surgery?