Great ideas, Peter Pan! I’m especially a fan of the third one. It recontextualizes Jar Jar in an interesting way without needing to change his character at all. You could make the battle the opening scene right after the crawl.
Really don’t like the first though. Maul having a button for the shield generators on his wrist is dumb on several levels, as it Qui-Gon sacrificing himself to deactivate it some Obi-Wan can kill Maul instead of just killing him himself.