That would be a really good stack. The only thing I would add is fish oil. Fish oil is a very strong anti-inflammatory which will reduce inflammation in your joints and help keep your joints well lubricated and feeling great.
This is the stack I recommend to any of my clients who are experiencing joint pain -
yes follow the muskrat protocol above but please also make sure you are being smart when you lift.
if you have an injury that appears to be chronic you really should see a good sports doctor and get some MRI's to see how much damage you have and follow your PT's advice