If you haven't, I'd recommend watching the Morton Jankel cut. It restores some cut scene segments and improves some of the pacing as well.