Questions:

Why does Threepio sneak down to the planet if he's a TF droid? It might work better to make him the Jedi's droid, not replacing the TF Welcome Party. (Note: This might make "Nice to see a familiar face" in ESB a little funnier, if you get what I mean?) If they're ambassadors, why shouldn't they have a protocol droid?
How do they get from the swamp to the city, if they don't visit Otoh Gunga at all?
If we're talking about no gungans, when/where/how/why is the Padme/Amidala thing revealed effectively?