Yup. Best episode of the season by far. Proof positive that fanservice can be a good thing!
I think the Saddle Arabia thing was mainly to explain why Twi couldn't go to the Princesses for help. Would have been nice if it tied into the story more, but eh. Nothing's perfect.
It's too bad there's no Derpy cameos any more, because I thought of a good use for her: when Trixie was being cruel to the mane 6 in the beginning, she could have zapped Derpy and straightened her eyes out. Monstrous!