when you go apply for retirement visa your immigration office will ask you to extend your current so you are aligned with your requirements. They know what to do and what to tell you
in korat immigration is an office next door. In my case the requirements are 3 copies of passport 3 copies of TM 30 supporting docs and a copy of retirement visa