I agree. Creationism is not science and shouldn't be taught in Science class.
Comparative religion is usually reserved for university. There just seems to be very little room for it, unless as an elective, in a rigorous college prep curriculum in high school.
Critical thinking is rising in importance even among the lower grades now. Elementary aged students are being asked, "Is this a credible source?"