Anyone reading this with hip issues, I can say only one thing.
Get thee to a poolery.
I went swimming yesterday and it was fantastic. I can't wait to go back. I had a whole plan that I would swim for half an hour straight which after a few laps changed to 15 minutes, which became 12 when a really good swimmer guy got in my lane and started lapping me, but regardless, it was great. A little steam room afterwards and a happy hip. Of course, until walking outside was required again, but still. An issue-free hour. Investigated different styles and found breaststroke was best for working the whole range of motion. Can't recommend it enough, if you have a pool to go to.