I would suggest turmeric. It reduces the inflammation that causes pain. It can be combined with ginger & boswellin for a more potent treatment.
As jetfan said, Epsom salt soaks should ease your discomfort as well - combine it with peroxide and do a detox soak to kill two birds with one stone!!