This seems tricky, because you have a complete thought making up the question, while you have separate statements within it. I think your second option accomplishes that better than the first.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.