Glucosamine, chondroitin, MSM supplement did wonders for me. I will probably try cissus sometime, too.
Last year I was MMA fighting in Hong Kong and Thailand professionally while simultaneously playing rugby on an HK team. My joints took the worst beating they ever have, and my right elbow (for whatever reason, probably from jiu-jitsu) got so fucked I almost had to stop physical activity involving it completely. I started taking the glucosamine/chondroitin/MSM supplement and it was the most significant effect I've ever felt from a supplement. Obviously, you don't really "feel" the effects of vitamins and fish oil which would be my only comparison point, but, with the g/c/MSM supplement, it was a miraculous difference for me.