I have been through a variety of treatments for hip pain and am staring down the barrel for another surgery. From the sound of it, your body does have limits even if the doctor clears you. Do not overdo anything. (Speaking from experience, this will only make life harder.)

-Incorporating more rest and actually respecting my body's limitations helps me. (This can be so hard to respect if life is busy! Saying no to things can be difficult.)
-Also I recently tried medical massage, and the therapist worked on all the angry places, so I am sure regular visits will relieve those places. This type of treatment may be helpful for you because tight and/or spasming muscles can hold joints out of place or impede nerves.
-Another thing that I have found helpful is icing; after my first surgery, I had an ice machine for my hip, and I found that to be more effective than pain killers. I keep large flexible ice packs now in my freezer. Ice machines, or the newer versions, can either be rented by the week or purchased outright.
-I also do hot baths.

I have been avoiding daily NSAIDs, injections, etc because I am wary of organ-related complications.