My intro course was great, and set me up for quite a few future courses. We didn't use a standardized text; he just selected a few works that the class went through over the course of the semester, interspersed with essay tests. We studied Plato's early dialogues, Descartes, Berkeley, and a few contemporary philosophers; though maybe it was just the prof, I'd say the bent was largely epistemological.
In my op, a good prof makes all the difference (with personal enthusiasm, of course); you might want to ask around if more than one instructor is teaching it.
As for logic...I wouldn't recommend that for a beginner. Some people are great at it (particularly if they're already good at math), but many never make the leap. Much logic supervenes from basic philosophical discussion, making the later transition to "real" logic less jarring, IMO. Just my two bits.