The depths of problems like this are beyond fixing via editing. This is reconceptualize and rewrite level stuff. The problem with this whole fanedit craze is we decide that everything wrong with a twenty year old film can and should be fixed, and the end result is a hacked up film. Just take a look at all the ROTJ fanedits who tried to "fix" the Ewoks in Return of the Jedi by removing them...
Sometimes good enough ought to just be left alone. Fanedits work when you take something crappy in hopes of making it into something bearable (though this begs the question: what is the point?). But fanedits of decent or good movies is something hard for me to get my head around.