Rick McCallum? I'm so glad he had no involvement ever in SW/ESB/ROTJ. What ROTJ really needed was for Gary Kurtz to stay.
And I like the idea of showing the fleet leaving - the last shot could be them blasting into hyperspace. When we pan up from Luke at the funeral pyre, we could see some Rebel ships leaving Endor, then cut to space where we see the fleet blast off into hyperspace.