If you're going to use Star Wars as a analogy for the Q plan, then I guess you don't know about the final movie spoilers.  RotJ may have seen the end of Darth Vader, but the emperor and the Dark Side lived on to see many more days. They eventually killed all the heroes and ended the following of the Jedi ways. Your analogy might be more accurate than you think even though it isn't the outcome you wanted. Also, Leia was not captured in ES. She escaped with Lando, Chewy and the droids.