I asked the Thai London immigration this exact question and they said if in Thailand I can go to this address in person and ask for the visa to be changed to retirement or else I would need to leave Thailand and cancel my dtv and request the new visa
The Government Complex Commemorating His Majesty the King’s 80th Birthday Anniversary, 5th December, B.E. 2550 (2007) Building B, South Zone, Chaeng Wattana Road, Thung Song Hong Subdistrict, Lak Si District, Bangkok
*****