Healthland is a solid choice for "no hanky panky" massage in BKK - however, I'm a bit surprised by your efforts to go there; impressive! (and apparently rewarding to you). Thank you for reporting back.
(on a different note I think your masseur/masseuse were expecting a higher tip than 100 B for 2 hour massage - I would have tipped 200 B, but maybe that is just me)