Hey Spence, just had a thought, not sure if you'll like it or not. But when Maul's lightsaber gets cut in half, could it then not work at all? Maul's death has always bothered me, as has his lightsaber working when chopped in half. Would it be possible to roto out his lightsaber, have him do a couple of back flips avoiding the lightsaber and then have Obi chop him in half?
Would seem a better death to me, and make Obi seem a lot more skilled, given his Master got killed, but then he kills Darth Maul...
Just a thought!