In that case I'll add this shot to your to-do list ;-)
Is the color timing of the Blu-ray identical to the HDTV version? In that case switching footage shouldn't be that much of a problem.
Also, I've found another thing: The matte painting with the speeder flying into Mos Eisley has no gate weave either.