The thing about the Vintage Edit's is that they are SD. That was fine in 2006, but I think a true "preservation" should be HD, because not only is that competitive with the SE version available, but its the highest quality and truely does preserve the films in a form that will basically be permanent (ie not upgraded; I suppose in the future if there is a new master of the SE with improved coloring and black levels then that would be a better start source, or if there is a BluRay with improved compression, but otherwise I think a HD-based OOT from the current HD masters is, relatively speaking, a safe and permanent master that won't be made obsolete).
Not only that, the 2004 DVD's are not the best source for an SD version--SWRevisited shows what an improvement a custom HD-downconversion can do.
I am of course being nitpicky. But as you said, if you are going to do it, do it right.