I mean, as good as the episode was, I can't see why Moffat would take that route for any reason OTHER than to just fuck with people. Yes, Missy being the Rani would have been obvious, but seeing at how many people guessed (correctly now, mind you) that Missy would end up being The Master it...