I'd also vote for either keeping Shaw as a ghost at the end, or a meld of Hayden and Shaw like someone suggested (but more Shaw-like than Hayden-like). I could go either way on the eyebrows/eye recoloring in Anakin's death scene.
--edit--
I've been reading the 1981 rough draft of JEDI tonight, and I came across the description of the Sarlacc:
"The prisoners look down into the pit and see a disgusting mucus lined hole at the vortex of sand. Around the edge of the cavity are thousands of needle sharp teeth and four thin, ten foot long feelers that sweep across the sand looking for victims."
If you could revert the Sarlacc back to the pre-SE version, but make the four tentacles move around as described in the '81 script as if they're looking for prey, that would make the pit come to life in a decidedly non-campy way (that beak was atrocious).
I've also noted that the '81 script does NOT include Boba Fett anywhere in the script, which helps the case for cutting Fett out of JEDI entirely. There's also no musical number in Jabba's palace either - perhaps this could be cut to improve pacing as well? The Oolah falling into the pit scene (a pissed-off smuggler in the script) could still be intact - Jabba's watching dancers as music plays in the background (not the huge number that is in the movie now), and one tries to take advantage of his levity and chokes him, at which point he drops her in the pit (cut the added SE shots in the pit as well).