I think it all depends on what you want. Tokyo is much more clean and organized, no question. It's so much so than, say Van or Toronto. No stray dogs or cats.
On the other hand, I feel Bangkok is more friendly to foreigners. There are so many legal options in Tokyo, from "pinsaro" (ie BJ parlor)...