@tlobliviate I think that should work yes. In your position, I'd periodically test the save to make sure sims can go to work—place the rabbitholes early if you have to, then quit without saving when you're done. And make a backup copy of the save each time you test, so if you see the issue again, you can revert to that save rather than starting from scratch. That way, you won't find yourself having done all this work only to run into the same problem.
Your NRaas mods should be fine to use, and in fact should help prevent this error and others.