If you don't have the Thai Bank account, I don't think you can't apply in Thailand unless your countries' embassy in Thailand gives out a affidavit confirming your income.
And I hear some Immigration offices are not accepting this affidavit for Non-O based on marriage anymore.
Better to get your Non-O back in your home country, and get the bank account when you arrive so you can set yourself up for getting a extension of stay.