I suffered from very similar symptoms. To the point that holding grocery bags was painful.
Adjusting my form did little. Eventually I had to stop doing some exercises as they were just too painful.
There was a friend, mechanic, who had tried Glucosamine. He said it really helped his joints.
I tried it. Within two weeks, without a doubt, the pain had almost dissipated.
The Dr. I went to basically said stop doing what you' re doing. That was it. No mention of anything else. Real helpful.
I' d recommend Glucosamine with Chondroitin. You can get it almost anywhere. Work for me.. no doubts.