Not yet mentioned: Fish oil.
I've been advised by my chiropractor to take fish oil supplements daily, doubling up the night before any planned high-demand physical activities.
Aside from the constant reminders to properly hydrate, he says this is the daily supplement equivalent of a quick shot of lubricant to your joints. For long term joint health I use glucosamine/chondroitin supplement, as our bodies slow it's natural production with age, but it's a long term build up and maintenance approach with that supplement.
I know, some find chiropractic advice a little suspect, and they like to push supplements.
However, at age 57 and over a decade of said supplement use due to demanding physical job/lifestyle, I enjoy trouble free playing in addition to complete comfort in joint health in general. I play almost daily, am fairly vigorous in my approach, and fortunately, no pain unless I use improper technique.
I would suggest you ask your PT's opinion whether it may aid treatment/recovery for your issue.