You are likely to run into trouble no matter what you do. You are trying to enter Thailand on the basis of being a tourist when you've been living in Thailand for over a year. Any immigration officer will question this and potentially deny entry because you are clearly not a tourist.
The best odds will be to go to a Thai consulate in another country and purchase an actual visa (if they will sell it to you based on your passport history), and then attempt to enter and make sure you have the 3 proofs with you.
1 - Proof of funds. 20,000 baht or equivalent in a major currency, IN CASH ONLY
2 - Proof of lodging. Hotel reservation for the first week or so that you will be in Thailand. If you have a condo lease or something like that, you don't want to use this, because it's more proof that you are not a tourist.
3 - Proof of onward travel. Proof that you will be leaving Thailand within the time you will be stamped in for.
You may want to look at purchasing expedited entry if you enter through BKK airport.
@Thai *****************************
offers this service where they will have someone meet you and help to solve any problems you may encounter while going through the Fast Track lane at the airport.