make what immigration says...... I would recommend go to Singapore make the non o visa , I go first to the web site thaiembassy Singapore upload the documents and there send you a mail for the appointment to get the visa
Deposit more money like 25,000 or 50,000 if you have it maybe immigration don't say something about the small money but you show you have more just saying