Machete most certainly. It's the most logical way to watch the movies and no ones edited it for that yet. Also, no offense, but the "keeping the secret" thing is one of the stupidest ideas ever for thousands of ways that I've gotten into too many times elsewhere.
So definitely go with machete. And why not have the mirroring as well? I've always loved the mirrors that Lucas put in, and I'd love to see a restructuring based on that concept.
Seriously, this sounds like just about the coolest PT edits.