Right, in addition to hot baths, you can make hot packs very easily. 2 lbs rice into 1 tube sock = microwavable hotpack. Start with about 1 min in the microwave until you figure out roughly how long it takes in yours, as power varies. If you have swelling, alternating heat and cold can help with that.

I've heard of arnica cream helping people, though I haven't felt it was very useful.

Massage is good, and from the sound of things trigger point massage specifically - did you guys ever get the trigger point workbook I recommended a while back?

Obviously, rest.

Do you know why this is happening?