Yes, you can turn in your old passport at the US Consulate, while waiting two to four weeks for the new one to come in the mail (along with your cancelled old one).
Then you take the new one to your usual Thai immigration office (Laksi?), wait on line and queue for the section that will stamp your valid visa in your new passport. Sorry if I wasn't clear.
I have heard intermittently that Tachileik and Myawaddy are open. Not sure if true and not sure if applies to foreigners. Please DM me if you find out. Also interesting if Htiki (K-buri), 3 Pagodas and Prachuap crossings accessible.