I normally take at least 15k baht in cash so that should be okay but yes like you said, it depends on the IO. They were a little annoyed with my last visit on the visa exemption which I changed into an education visa, when my return flight was to Malaysia as proof of departure, but I think that is because I had only left a month earlier so maybe they thought why did I return so quickly.