Can I transfer my ED Visa to a new passport while entering Thailand with both passports?

Hey everyone. I currently have an ED Visa that is valid until July 2020 (I have to go and extend it at the local immigration office every 3 months, but still).

I am going home for Christmas in December and plan to get a re-entry permit. However, my passport is also almost expired (July 2020) and almost full. I am intending to get a new passport while back in the UK over Christmas.

My question is - can I just fly back into Thailand with both of my passports and get the visa transferred over either at the airport immigration or local immigration, or do I need to go to the Thai Embassy in London to have the visa transferred over before I come back?