Only when the plotholes make shit just not work, lile teleporting characters, or plot twists that involve the ol' "you thought I died onscreen, but it was just a flesh wound that looked like impalement" do the plotholes really fuck things up.
Ehhh... so did Neo. The machines let Smith overwrite him, so they could fry that iteration.
The machines likely had their engrams saved, and definitely had their bodies. Clone 'em, stitch 'em back together, homunculus them, whatever. There was a big ol' time skip between Revolutions and Resurrections anyway.
Especially since "Neo" had been through however many cycles before according to the Architect.