Personally, I feel that the prequel trilogy should have been designed in such a way that one could watch in "story" order (I-VI), and all OT surprises would be preserved.
Obviously, that's not how it worked out, and I don't think it's possible to make it so by editing the prequels. They'd need to be re-done from scratch.