1 day before the e visa. Hope you are entering on your 90 day visa because you can’t switch to non imm visa after you enter on tourist visa unless it’s for marriage. You’ll have to leave the country and reapply after you enter with TV. And you can’t apply for non imm inside the country, so it sounds like you might need to rework your plans.
It’s true they did change it to “unlimited” times you can enter but if you stay 180 days with just 60 day + extension they will ask you to get a real visa or not come back until next year
Best to come and try living here for a little before you all in. A lot of of westerners imagine life being different and end up leaving. Get a nice test run in