It totally smells like a Madoka move, but at least Aya had to actually work hard and suffered like hell until this point.
It feels like this is ending, but some things still look unsolved. Kayo should still have a copy of Nijimin's stick, which I've been hoping it would have some importance at some point. Also, what was the point of doing all that work to save Yatsumura if we are going for a reset ending?
Well, at least it seems that the Mahou Shoujo of the End characters were not relevant to the story, just a cameo for the shit and giggles.