So what if instead it were made so Anakin died on the shuttle after it had already escaped the Death Star? Then we transition back to Han and Leia on Endor and any celebration there that might happen, then have the ending Adywan described (Luke burning his father’s body alone as the Jedi ghosts look on).
That actually sounds pretty awesome, I’d love to see that in the edit. The only hitch is how difficult it might be for Adywan to pull off, he could probably do it but it would take even more time and effort.