As Jar Jar has been brought up a bit, one way to add some nuance to the Gungans (without removing Jar Jar as I agree that this can’t be done, it would break the plot of both ep1 and ep2) could be to dub them with a fake alien language with subtitles when two Gunguns are talking to each other, like in the swamp scene or the final battle of ep1. This would imply that their poor use of English/Basic is because it’s a second language for them.
I’ve had that on my change list for a while.