I say for the ultimate Blue-Ray release:
2 discs per movie, Original uncut with alterenate tracks and that stuff and selection for ANH on the crawl for Ep.4, and the other being the final version with everything fixed, EVERYTHING
and a bonus disc with a documentary or whatever, trailers for all of it and deleted scenes, hi-def deleted scenes, or as good as they can get