Supplements and Diet

Hello,
I am new here and am currently seeing a physical therapist for TMJ and the terrible muscular tension in my neck, shoulder, and jaw. However, she was not familiar with any supplements that might help and referred me to the nutritionist on staff. So my question is: are there supplements that can help promote healing in the joints and muscles? I am currently taking a calcium/magnesium/Vitamin D pill on the recommendation of my former chiro, as well as a multi-vitamin. I am just curious about other vitamins/minerals/etc such as glucosamine or chondroitin or others like that. Has anyone found they helped? Or hurt?
I'm also wondering if I should avoid certain foods - not just hard, chewy foods, but others types of foods or ingredients. For example, I had a great day on Saturday, and then had two drinks that night. Sunday the pain was terrible so I wonder if alcohol triggers something. Any thoughts?
Thank you so much, I look forward to reading more about TMJ here!
~Gina