Oh, yeah... I always thought that "non-wiped droids develop quirks" thing to be a hint at emerging sentience.

The movie narrative itself can't really decide what they are. You have Obi-Wan offhandedly mention that droids don't think in Ep II, but R2 and C-3PO are treated as people, and even the battledroids are shown as having feelings.