The real answer to your problem is awareness and discipline. Sounds like your at least halfway there!
web: not opening non-work related sites
The solutions to these self inflicted problems do not require more "tech". Quite the opposite, really
Phone: Faraday pouch
(Personally I don't work this way anymore but that's where I'd start if focused on those aspects)