Another thing to consider is replacing the tranny with the more reliable 3 speed, these should be plentiful in salvage yards.