Sounds to me like your cutting most of the good stuff from Jedi. Luke and Leia being twins is great it makes perfect sense as to why they love each other but feel weird about it in TESB.
As for Luke telling Vader there is good in him that the whole point of the movie. Luke showing Vader that there is good in him and bringing him back to the light side.