acupuncture would be a nice compliment if you have somebody decent.
don't be shy with the NSAID's (don't over dose), but aspirin, ibuprofen and acetaminophen can all be stacked to achieve a more powerful synergistic effect without overdosing. (that's basically all excedrin is, minus the caffeine, and a lot cheaper)
i would suggest 250mg of each taken every 6 hours.
a nice hot dit da jow if you have a good formula (post first 48 hours)
contrast thereapy works great too,
check out my blog article here.