I've started with a ritual to finish each session going over the painting with a pair of tweezers removing hair and other stuff. So much easier than realizing afterwards that "the fuzz" has dried together with the oil.
Another great tool I use is the tape line (and the ruler). I use it in the first stage when I draw the motive on the canvas.
I finished today's painting session quite recently, and I am more or less on track. A couple of more days and I can relax a little.