Thanks for posting the update. Knees are tricky, baby it.
I am sure I will start all sorts of catcalls, but get a bottle of cod liver oil (you can get it flavored) and take 2 teaspoons a day in food. I think it helps the joints. Some studies back me up. The best brands (most pure) are Nordic Naturals and Carlson's.
Naproxen is a non-steroidal anti-inflammatory that is also a good pain reliever. I think it is bad to take it for a long time, however.