FINK?
;-)
To be clear, there is stuff that I like in Jorge's edit better. But there's stuff in there I don't like as much (leaving doom town in, for instance) and at this point (so far) these are the only two options we have.
I also like the AVCHD and true 5.1 of Q2's edit.