It is so funny to me how many people both 1) Don't realize the witch is obviously future-Elsa and that there have been hints about some possible timeline fuckery for a WHILE now. and 2) That this isn't "time-travel" it's save scumming. This world is first and foremost a video game, this time travel is literally the equivalent of reloading a save after getting a bad end.
More on topic, I wonder if the infinitely spawning beasts is some form of glitch introduced from Future-Elsa fucking with Evie's data. It seems like her trick of turning her into a "demon" was part of her plan to subvert the "villainess system" and I wouldn't be surprised if this is the game snapping back.