[aaronmarks]

A great trick I've found w/r/t your first tip (going to unproductive websites when feeling initial frustration) is to stop using the "Keep me logged in" option on those sites. If I hit a problem and habitually go to Facebook or Gmail, having that buffer layer of needing to log in makes me stop and think "Wait, I should really focus on the problem I've avoided by coming here."

[patrickyeon]

Good one. Randall Munroe trained himself to turn off his computer whenever he switched tasks, so that the handful of seconds worth of power down, and then boot up, would break his habitual distraction. http://blog.xkcd.com/2011/02/18/distraction-affliction-corre...