Magnesium is excellent for muscle stiffness and pain. I've also heard some with Fibromyalgia do well with something called Malic Acid for muscle pain.
Also, make sure you are getting sufficient fluid intake - dehydration will make muscle pain and stiffness worse.
Take care,