Great steps! You can try a couple more:

1. Move all non-essential applications to second or third screen. Keep only the ones you want to consistently use on the first one. The harder a task, the less likely to happen.
2. Black and white filter. Sounds drastic and it is, but it removes all the color stimuli, it makes everything … dull. It worked for me and for a few others I got the idea from (didn’t save the articles/links though).