I am not sure if hardware or software can fix the issue. I doubt it. You found and will continue finding ways to loose focus and procrastinate. So did I (and of course still do sometimes).
For me another approach worked to some degree. Pomodoro and Time blocking.