For point 4, I'd go further and use a separate user account/computer. Nothing private on work account, not even email or a single news site. That has helped me

For point 4, I'd go further and use a separate user account/computer. Nothing private on work account, not even email or a single news site. That has helped me draw the line easier: to procrastinate or answer any private message I have to either use my phone or boot up another computer. On the water jug I disagree though, I think it's good idea to get up from the chair every now and then even if only to fill the water glass.