And I would definitely try glucosamine hydrochloride or sulfate in combination with chondroitin sulfate (the osteoarthritis formula).
If this is going to help, it may take six months.
FWIW, my mother swears by this stuff. Apparently, it will effectively reverse (not just prevent) a lot of degenerative damage, even in late middle-aged and elderly folks...
(as always, of course, your results may vary)