I got a new passport because my old one has less than 5 months left, Can I get my non o marriage visa transferred into my new passport at the border say ....Nongkhai?

I didn't realize that my 90 days are up tomorrow so I need to do a border run, what happens if I leave on the 3rd?.....pay 500 baht fine?

I'm looking for cheap flights for tomorrow as well, I guess if I get there early enough I can have everything transferred to my new passport at the airport.

Any advice?