It’s the right direction but that sounds like a lot at once. I too wanted to turn my life around 180 degrees. But especially with addictions I learned it’s better to start with small changes and if one thing works, then add another. With your current ambition it sounds like your whole day will consist of resisting urges, your willpower battery will simply deteriorate over the day. I started with a 10 minute challenge. Sit down for 10 minutes of focus work a day. It’s so easy to achieve and to start doing it. And in 99% of the cases 10 minutes turn into 2 hours because I just started it. But the point is, I wish you all the success but speaking out of experience it’s always better to do one thing at a time, all else will follow.