D.C.P.A.F (Direction Centrale Police Aux Frontières)
Administrations de l'intérieur
100 rue du Four - 94550 Rungis Complexe
Work+(0033) (0)15 670 1978
These are the people who deal with passport control at the airports. I would get in touch with them and complain and ask for a letter from them to stop this happening in future. Rather than playing to the tune of some fonctionnaire who does not know their job.
I personally would also get in touch with my deputé.
I would also get in touch with the american embassy and complain bitterly too, but that is just me.