Perhaps you could run the factory restore from the main partition, but putting it in RUNME.sh with my data.tar.gz, then with ENABLE_DIAGS deleted from the usb drive, reboot to main.
I have noticed some script problems with dasmoover's image too. I got a supposedly "factory fresh" image from another user. At some point I need to compare it to dasmoover's image.
Perhaps the scripts on the main partition will work better, when run from RUNME.sh.