I just want to throw in another option although I'm pretty sure you're just going to restore the original version of the Wampa scene. I'm thinking of some kind of compromise. So, based on Ziz's picture comparison...
Keep GOUT3, remove SE7a&b, keep SE15, and remove SE23a.
I really dislike the Wampa's appearance in 21. It isn't necessary and you probably don't want to, but is it possible to remove it? Does it disrupt the flow drastically?