Finding other things to do when bored instead of opening a browser is key. You're going to fill the time with something, so you have to find the something else.
You can try LeechBlock. It works as plugin in all browsers.
First thirty seconds are the worst for will :)
So it is better to ask a relative/friend/parent/spouse to set up a password for you - then you cannot unblock the sites back again without them.
I found that it's much harder for me to procrastinate on my laptop when I am working with peers. The repeated focus time on the laptop during work hours 'conditioned' me to use it for work more.
I kind of agree with you in a way as I ultimately think that working remote is a bit harder on social health and maybe even physical health of getting out of the house, but in another way I just don't know if I can go back to all the negatives of the office.
I mean, my toilet at home washes my ass with gentle warm water. The work toilet randomly decides to splash toilet water on me with the violent "automatic" flusher after I'm done wiping myself with transparent sandpaper.