Sadly, the only ways to retain the surprise would be to cut all mention of Darth Vader from the PT or do what TV's Frink said. Unless you fancy making three new movies that can serve as the PT for hardcore fans.
But yeah. As far as I'm concerned the OT is a contained story and as such I don't think the PT is really necessary. Just my thoughts.