Every time I've injured a joint I've used Ibuprofen and Cod Liver oil.

Make sure you're getting your essential fatty acids