Yeah, some of those elements were pretty weak (but I didn’t think the orgy thing was particularly out of character for Amy). But Zapp’s squirming explanations had me laughing too hard to dismiss the episode entirely.
I too feel that I didn’t waste the 20 odd minutes I spent watching each episode for the most part.