For the record. When the first Trailer for the DVDs was released on sw.com (via Hyperspace) back in early 2004 it showed '97 SE footage only. A version with the 2004 Transfer came later that year.
And the new TPM Transfer is done for years. So its no surprice its in the Trailer.
I think we should just wait and see. Its rumored that George/Lucasfilm was working on these BDs for years as Timstuff mentioned in his post.
The only thing that is for sure rightnow is the fact that the O-OT wont be included which is very, very sad.