After watching Episodes 1 & 2 before a cinema showing of Episode 3, I finally accepted just how much a re-edit was neccessary, and after a good look around the net found that these seem to be the prefered edits.
Downloading them now, can't wait to see them.