Cheers. My landlord has insisted on filing the TM30 herself, so if a TM28 is immaterial, I'll leave it that. I have no plans to visit Immigration again until our Extensions are up for renewal in November 2020!
She can stay as your dependant, but she will need to come back in on an O visa. My wife was able to get her O visa at Immigration in Chaengwattana (she had a tourist visa) but I understand they will no longer do this.
Immigration can give you a replacement Re-entry permit in your new passport but I doubt it can be done at the airport. You'll need to use the old passport with the visa in it anyway, so the Re-entry stamp in the old passport is still valid.