I don't really see much that appears to be a consciously thought out plan to torture Cloud, apart from Jenova's decision to assume Sephiroth's appearance. Then again, my memory of the last third or so of the game is rather hazy. For the most part, though, your assessment appears to be spot on.