Pretty much 'all of the above,' and I enjoy chamomile or gingerroot tea. The chamomile is calming and the gingerroot is soothing to the stomach (as is chamomile) and also anti-inflammatory. I know they're not for everyone though, especially with allergy concerns.
I have heard cherry juice is good for arthritis, and many people drink that. I don't know if it helps fibro, but it might be something to try (sounds good, too!).
Of course, it's always good to check with your doctor before starting new things.
I think alpha lipoic acid and glucosamine/chondroitin supplements have been mentioned here, too, but I really don't know enough about them to comment. Am looking into the alpha lipoic acid right now.
Best wishes and hope you find things that help! :)