Hello Bob,
Good work! What you do is really what you need to do. To organize yourself is really hard but it is one of the most important things.
I would suggest you to keep your work. Make sure to save you collections, and after that just validate them with the new Historical data.
This way you will not need to run generator/reactor after some time for the same asset and the same time frame.
Kind regards,