I agree with those who suggested an NSAID. I happen to like ibuprofen. I have also taken Aleve and meloxicam with good results.
I got a prescription for meloxicam yesterday and, with my SilverScript, paid $1.24. It can be a good maintenance medicine.
NSAIDs also help with swelling that you may not even notice, and can be a source of pain. Also, glucosamine can't hurt.