I'd go for the first one, too. In my experience, courses for non-science majors seem to get taught by the more dynamic, interesting professors in the department.