Gaz,
It sounds to me like you may have some OA or possibly some maltracking, your symptoms seem to indicate that, but I'm no doctor so its just a guess, I would try to see your OS again and see what he says or maybe go for a second opinion. Good luck.
Natalie.