I keep thinking Qui Gon as Skywalker might work and maybe the pit Maul falls into empties into the fiery lava pits where the Emperor finds him before rebuilding him in the black suit.
Building a story to go AROUND all that would be a trick, but some things could connect well.