aalenfae said:
Just take out Padme's lines about previously being queen from AotC, and then you're fine.
I think.
That would work, but it will still not make too much sense why in the part when they are getting to the viceroy, Padme is leading everyone if she's supposed to be a simple servant. And also why is a servant choosen to be a senator in Episode II.