Yeah, that episode probably would have worked better if they went for a prank war between Rainbow Dash and Pinkie Pie kind of plot, instead.
Make New Friends But Keep Discord might count. Seriously, why was Twilight acting like she was going to turn Discord to stone again if he tried something stupid?