I too have struggled and continue to struggle with wasting time on the internet. A couple of things that have helped me recently:
Removing the facebook news feed.[1] I can still use it for messaging, checking on specific people etc but the wall of information and addiction is gone.
Removing all but the single video you are watching on facebook [2]. Again, you can get to useful videos or search for something specific but now you don't fall into the 'youtube hole' when the first video finishes.
I suspect this will be something that everyone has to be conscious of all the time, much like being careful that you don't eat too unhealthily. I don't think any one tool will be a magic bullet.
[1] https://chrome.google.com/webstore/detail/news-feed-eradicat...
[2] https://chrome.google.com/webstore/detail/df-tube-distractio...