@Da *****
You cannot renew your non-O. The only thing you can do with that is apply for a 1-year extension of stay. Nothing else. Deposits won't do anything for you. You either show embassy certified income of 65,000 baht per month, or 800,000 baht in a Thai bank account. Those are the only options.
You apply at the immigration office that matches the TM30 that is filed for where you are staying.
If you have a re-entry permit you cannot enter visa exempt (not a tourist visa) because they will stamp you in on your non-O visa entry stamp. If you do not get a re-entry permit, then you can enter using visa exempt and receive a 60 day entry stamp.