I voted for the calc based physics. While its been awhile, I don't recall the calculus they put you through in physics 101 being all that intense. And I also recall having it fairly well spelled out, ...

Students pursuing or likely to pursue majors in Mathematics, Chemistry, Geophysics, Geology-Geophysics, or Physics, or following the B.S. program in Computer Science, should take one of the Calculus ...