I think if this problem is worrying you about your future functionality, you probably need to investigate things further.
Not sure of your age or location from your profile on here, but I think a reasonable stert would be for your doc to try and differentiate between an inflammatory condition, and a "wear and tear" condition.
The stiffness and pain in the morning should perhaps spurn some further work up (bloods and an x-ray at the very least I would have thought.)