Had a similar situation with a retirement visa. And it is better to get a new passport here and get it transferred. If You only have 6 months left on your passport, you may not even be able to travel.
OK. We are not planning to travel until the end of March. What do I do if it takes longer than what my 30-day visa on arrival ? Do I just pay overstay ?