You should have done it earlier but you're still good time to arrange a 60 days visa in New Zealand if you get going immediately. It's easier than all this other crap
yes at the end of the day it's the easiest way to go because the way the Thais organized this is the usual mess because they haven't thought it through and leave it up to the customer to figure the rest out