The second one.. Hopefully, I'll have the finished version done and uploaded the day the MLP finale airs in the US. 

Things that will likely change:
-more coloring
-improved lip sync
-less