Go get an orthopedic consult, or go see a physical therapist first. Its likely that both will each refer you to the other.
But if you have a good ortho surgeon, he should be able to diagnose pretty darn quick whether you need surgery, or therapy.
Good Luck.