Might consider light knee wraps, enough to insure warmth/blood in the knee cap area. Or a heating element (rub, lotion, etc.) for increased warmth/ blood circulation. In either case, keep the area warm before, during and after leg exercises.
Glucosmine/MSM is a excellent combo. If you can, try for a liquid or powder form. Easier for digestion and full breakdown, in the digestion tract, than the hard pill form. Good Luck.