During this semester, did you use break time wisely (if you had any)? If so, Option 2. Else, Option 1. Even if you "know you'd be better about the break this time around", I'm speaking from experience - it's a very rare occurrence to break the habit of avoiding studies during break time.
I did have a break very similar to the one suggested, but it was mainly used for recreation/consumption of sustenance. I think on the whole, however, I study better at school than at home.
That all being said, I was leaning towards option two. Due to forces beyond my control, on the other hand, I was forced into option one. Well, option with two class changes. Same time slots, just different classes, which was quite serendipitous.
One. I rather not do evening classes.
In grad school you learn to hate day classes.