The more I think about it, the more it seems you should never watch the movies in episode order. That's not the way they were released, and not the order in which they were seen. By preserving the secrets of Anakin/Vader and Luke/Leia, you lose too many other good things.
Release order is the only way.