I really agree with all of this, I do all of these things too. Recently I've been very convinced of the usefulness of creating a good environment for work and life. Most people's will power is not enough to work against environments that encourage behaviours that are contrary to your goals.
For example, if you have a large TV in the centre of your main room in your house, it encourages watching it of course. Just deciding to not watch TV is rarely enough, you should also change the environment by defocusing the TV in your main space. That's just one very literal example, I would like to write about it soon so maybe I'll go into more detail if I do.
I also have really embraced better ways of planning, and the self monitoring that feeds back into it. I'm going to write about this a bit more but I did a while ago here. I try to use apps and technology for me, instead of against, and that can be quite hard at times, you have to seek out designs which are not subtly against you, such as the way Facebook works.
Also, you might like to read an article I wrote on a technique I called "The One Thing at a Time Manifesto", it seems to be in your area of interest.