The death of Spock was actually a gutsy move no matter what I think of the story itself. If Nimoy had chosen to not return to the Star Trek
fold as Spock his death would have retained a real poignancy. His absence would have resonated throughout any future Trek feature films even if a new character (Saavik?) managed to fit in with the rest of the original cast. But since Nimoy had a change of heart and did return Spock's resurrection rather undermines the poignancy of his death in TWOK.
Even the title of the following film, The Search For Spock,
pretty much gives away the whole point of the third film. It might have been nice if they could have come up with a title that wouldn't have spelled it out so blatantly before you actually sat down in the theatre.
Some years ago I wrote a rewrite outline for TWOK. I wish I knew what happened to it. Essentially I retained all the major elements present in the existing story, but tweaked it to fix the things the really bugged me. And assuming Spock still dies at the end then it could still work.