After reading your post, I realised that today's episode showed how both avneil have swapped roles/characteristics. Before neil was the smart and calculative one who didn't rush into things out of emotional impulse and followed the rules, and avni was the impulsive, emotional, short-tempered one out for revenge who broke the rules for justice, but today showed how the tables have changed, with now neil resorting to secretly disregarding the law out of anger for the injustice done on avni and isn't even thinking about his safety, just like avni did due to the injustice that happened with her and her mother, whereas avni has become the one who has learned to not let her emotions take the better of her and think everything through thoroughly before taking action.
I wonder if this was intentional by the cv's, because today even neela was showing concern for neil's obsession to take revenge from vidyut to get justice for avni, just the way she showed concern for when it was avni hell bent on taking revenge from the mehta's putting her own future on hold.