Had x rays done about 2 months ago, 3 visits to the GP and am now finally reffered to a specialist, moderate to sever degenerative wear and tear showed in the X ray, I need an athroscopy to get it cleared out is my guess (and ive been here before lots of times) but am still waiting for the specialist visit, the ONE thing thats made it feel better is riding, I had 3 weeks where I couldnt get on the bike, then uncomfy for another 2-3 weeks or so, but ive since upped my riding to 2 times a week and the knee is about as good as its going to feel for now. Its not even locking up as much as it was.
If you can ride and its not killing you, ride, you will know when its borked.
Did you GP prescribe anti inflamatory gel? I found this did help ease it off.