I definitely agree that the word "citizen" is preferable when a general term for people is required. "Citizen" makes people sound like equals; consumer makes it sound like a few of us make something, and the rest just take it.