Fluttershy: *growls* Not. Your. FRIEND! Discord: Who cares? I can do whatever I want, whenever I want. I'm Discord, the master of chaos! You think you can boss Discord around? You think I'm just going to turn all this back because you say so? Because if I don't, I'll lose the one friend I ever had?! *pauses* Oh. Oh. Well played, Fluttershy. Well played.
I agree that this is not how I thought the episode would end. I know the show is supposed to be about how friendship is important, but COME ON! A better ending would have been the group (mainly Fluttershy) learning that not everybody can change.
I mean, Cadance and the crystal ponies killed Sombra rather than befriend him, right? For good reasons.
Still, as much as I dislike the whole "Reformed Discord being complete", I'll find a way to work with it.