Not being horrible but not having the required funds and having enough money to last a year, at 36 baht to the pound and falling, I think you should seriously evaluate where your going to be a year down the road before you take the plunge of moving here.
only you can decide it's worth the price of a reentry permit against you current extension/permitted time to stay or get a new Non O and start again. A reentry permit isn't going to extend your current stamp.
Kyle Addison to try and make it clearer, you don't even have 'Residency' in Thailand. You only have a temporary permission to stay. That is determined by your length of visa entry OR a 12 month extension of stay.
That isn't classed as residency, even for Thailand.