From my experiences of working from home, removing distractions is a big help to developing the discipline you crave. I found, eventually, you will start to benefit from a clarity of concentration that you just don’t get in a shared office and your work will just get done and it will get done more quickly and to a higher standard than you ever thought possible. You have to appreciate that you are going between two very different working environments, the chaos of an office of people to the self-organisation of your own space, goals and timelines.
Another thing to bear in mind, is that it’s very difficult, and I would argue counter-productive, to try and work all day. Our brains can be very funny things and they often need a bit of down time to process what’s going on and deal with it. The upside to this is the ‘free’ problem solving that you can develop subconsciously. Now, that really is something worth developing.