I would have elementary logic in high school. Anyone who knows reading/writing/arithmetic is ready for logic so it can be done when they are ready for algebra. I would also have senior year science be done in journal club format where a students present at least least one paper a semester and tests are given over all papers presented (which of course all students should be reading before the presentation.)