well, I think we could kinda combine those 2 ideas, say amity has started to act more 'rebel' since luz came in, and with her problems with magic training, odalia as punishment pulls some strings so the principal is the one that makes amity go to the baby class to, even if he doesn't want to.
I feel I can try to do it, I may have some troubles but I can promise to try my best, and who knows, maybe we could say for the first idea that is something that happens in this version of the story