I have found acupuncture to really be a benefit. Find a good one - 2 or 3rd generation with years of experience. And make sure their english is good - you need to be able to communicate exactly the issue so that they can determine - stress, alignment, muscle, nerve, etc. etc.
Especially since you saw some benefit from the anti-depressant Amitriptyline. Yes - massage may help as well. You might find an acupuncturist who also does Tuina - chinese massage. But I wholeheartedly recommend acupuncture.