Thai massage feels really good, you can fall asleep while you get a full body one. I was just in Thailand and got 3 massages while I was there, how I wish I lived there! I would get one every day. I had problems with my leg aching a lot, it felt as if I had dislocated it, well not that bad but it disappeared after the massage.
Shiatsu, you would be sore afterwards and may need a pain reliever.