I take glucosamine and chondroitin and find they really work for me. I used to get loads of injuries, mainly to fingers and toes, along with general tendon soreness/injury. I'm not sure if glucosamine+chondroitin will help heal an injury but I'm convinced they help injur prevention. Try them along with fish oils and perhaps lay off training for a couple of weeks to let yourself heal.
I also reccomend yoga or some other sort of deep muscle stretching. This also reduces the chance of injury from training.