You're not in hurry with yoir passport. Most easiest way is to apply new passport in your Bangkok embassy and sfter receiving new passport go to the one stop service (immigration) and ask them to change the info and transfer necessary stamps onto new passport. Also embassy gives you a letter explaining your passport has renewed. This way is less hassle in my opinion...?