I'm in a somewhat similar situation and I'm also not sure what I'm doing, but I'm leaning towards entering on my NZ passport and just acting like I'm a tourist even though I'm going there to live 😂 got to fill out the TDAC though that's the only annoying thing as a return date is needed. Thais on foreign passports don't need charged overstaying fees, from my understanding.