I decided it was best not to re-encode at all. The DVDISO I have prepared contains the exact footage which mielr provided me - just cut together to the best of my ability from the two different sources.
I'm going to burn it off once I can stop the torrent I'm seeding now, and right after that I'll put up this torrent. (And since I coadmin a friend's server, I'm prolly going to use it to give the torrent a little kick.)