TPM for sure. The menu's were better, it had an overall better feel to it, the extra's were fresh.
Even though the movie AOTC is a lot better, the DVD looks like a rehash of TPM, but then not as good. I would have expected them to make it better as a DVD than TPM. I think, as a DVD, TPM is still one of the best DVD's I have.... (well had, it got stolen from my house last summer, but I'll buy a new one one of these days)