Thai massage, from a properly qualified masseuse.
Explain the problems you are having rather than just turn up and ask for a massage, although they should be able to spot what's wrong anyway if they're any good.
It won't get fixed on the first visit, possibly not on the second or third. But over time, it will be a lot better than taking pain killers which only mask the pain and don't do anything to address the problem.
I had a problem with my arm/wrist (it appeared to me to be ligament strain or damage. It was extremely painful when I woke up, and would hurt like an electric shock if my arm was jarred, or pulled at all) and went to our local massage place in Chiang Saen. After about three or four visits (couple of days between visits, as recommended by the masseuse) it was much better.
She then advised me to come back once a week for another couple of weeks.
Sorted. Never had a problem with it since.