knee pain and swelling

My pain started 6 weeks ago. My knee was swelled for about 1 week prior and then I encountered sharp pain to the left of my kneecap. I was unable to put full weight or totally straightenen the knee without pain. I saw a doctor who suggessted pt. I went and was given several exercises to strengthen my knee. PT said my kneecap was tracking laterally and that was causing the swelling. The doctor didn't think so. Now the doc says to just come back in a month (continuing the exercises) if it doesn't get better. My question is do you think that is too long to wait? It pretty much is uncomfortable or painful all the time but not like the 1st week. PT says to not exercise to pain but I feel like I am getting used to it so that I can't tell when I've gone to far.