Actually, I completely agree with the interpretation LordBucket posted, both because it offers a much better reason for the way Discord acted (One point in particular was the ease with which Twi undiscorded the rest of the mane six; if Discord had actually put his full power into that, Twilight Sparkle would be effectively Celestia-tier in terms of sheer magical power, in that she was able to break a supposedly powerful enchantment cast by a living god with minimal effort, and then was able to channel the power of the EoH through her friends to "imprision" him again.), and because it make the way they crammed everything into p2 much less annoying.
-snipped a bit-
Also, 31.
I don't think Twilight would need to be Celestia-tier to undo the enchantments cast by Discord. Remember that that in this universe friendship is, in fact, magic, and very powerful magic at that. Now, that's not to say I don't like LordBucket's theory, I think it's elegant and quite plausible.
The point I was making is that it looked like Discord pulled his punches with the corruption of the mane 6, meaning that the enchantments weren't nearly as strong as he could make them, just strong enough for Twi to have to work to break them. Which would fit in perfectly with the other evidence that was established that pointed toward what LordBucket was suggesting. In other words, if Discord (Who, from what we've seen of him in canon, is essentially some sort of god with control over time and space) had used his full strength, Twi would have needed to break it using only her own magic and her feelings for her friends. So, as you said, the magic of her friendship. And keep in mind, she would be doing this without the power of the EoH, as from what we've seen they don't work if used in concert, meaning that she would be indirectly pitting the power of her friendship against that of a god which even Celestia and Luna were only able to "imprision" (although going by this interpretation it is doubtful if it actually came down to a battle of power between them and Discord).
I guess what I was trying to say is that the fact that Twi
was able to break the discordification, and in such short timespans, indicates that Discord wasn't being very serious about it, as she was only relying on the magic of her own friendships, rather than that of the Elements. After all, if friendship is magic, then it must be treated as such, and if Twi's was powerful enough to break the full power of a god, she would by default be equivalent to one, at least in terms of sheer strength, which she really doesn't seem to be.
While she is probably the most magically gifted mortal in Equestria, the two serious situations have been solved through the use of the EoH, which appear to act as magical amplifiers which provide high levels of enhancement to the magic provided by the friendships of the mane six. In Robert Jordan terms, she solved both two-parter conflicts by using the equivalent of a circle, all members of which possessed an angreal, rather than her normal magical ability (which, as you noted, includes the magic of her friendships).
On a significantly more awesome note.