Moving before previous year amended refund would arrive - when should I file?

In doing my 2024 taxes I realized I made a mistake on the 2023 return and should get a refund. TurboTax won't let me file an amended return electronically for the previous year (I'm using TT 2023) so I need to do a paper return. The estimate is 8-12 weeks for the refund check. Problem is, I'm moving to another state in 7 weeks. On top of that, I will have a name change in the same time frame. Should I file now and hope that the USPS forwards the check? Or wait until all the dust settles and file it once I'm at the new address even though it will also be a different name? And would I put the current address on the 1040-X or the name/address that was used on the original return?