The way it's sounding now, we could possibly have both R2 and C-3PO be the personal companion droids for Padme. One way to treat them both with respect is cutting out their use for cheap (and stupid) comic relief (ala their entire role in the last third of AotC). So here's an idea: R2 and C-3PO are introduced proper in Attack of the Clones, C-3PO is the one who greets Anakin and Obi-wan when they arrive at the apartment instead of Jar-Jar, introducing himself in the usual fashion as well as adding that he's assistant to Padme and even introduces his counterpart R2D2, who is Padme's personal astro droid, and later the one doing the secuirty scan at night, which makes sense why Leia would inherit those two specific droids when Padme probably had many more. It also means that Luke, through Leia, indirectly inherits R2 from his mother, just as he indirectly inherited his lightsaber from his father through Obi-wan. But, I guess that's sorta getting ahead of things.