broadcast order imo, but the other way does make more sense
also, I would not skip the Endless 8, if anything 4 of the middle episodes... I watched all of them, if you can't take it just skip it when you really can't take any moore of the deja vu... it pays off when you watch the movie