Yes, but all those inconsistencies and annoyances can be put aside if you just do what I do, and ignore the prequels and all the other side-nonsense.
Ideally, Vader's backstory is kept a bit of a dark mystery, and you have Episodes 4-present and whatever side story movies they make from now on(unless they let Lucas make another one, in which case ignore that one too). Everything else hits the toilet.