I would think number 1 is probably correct but a little bit awkward and needs additional ponctuation : '... '. Number 2 is better and doesn't need additional commas, since it displays in the 'logical' order.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.