We are currently re-structuring our curriculum to nurture all Physics (and Astronomy) majors. One way this was done was to segregate the majors from non-majors in the introductory classes.  We also employ undergraduate Lab Assistants and Peer Tutors that are majors, to begin gaining experience in teaching.  Also students have participated in public outreach talks to enhance their public speaking skills.
We believe that ALL our graduates will be teachers of some sort at various stages in their careers, and that they should learn to be GOOD teachers.