So I'm thinking about using the HDTV rip of TPM as a main picture source as it still retains the grain of the image. Then I would the HDTV coloring to the Bluray coloring, use "match grain" in AE to apply the correct film grain to the Bluray, and I would align the HDTV correctly over the Bluray and blend the two together so that most of the picture is the HDTV, with the edges being the Bluray, much like what Ady did to restore the uncropped shots in ESB:R using 35mm scans.

It seems like this would be the best way to retain all the desired detail in the image.