I have a third option, work time. I have specific, inviolable times when I get on and off work. Past 8, I am off work and all work-related notifications shut off automatically. I've found this helps perfectly isolate work from life.
Working whenever you feel like it is hell, I agree.
All the work code, emails, tickets etc. are on it and once it's closed for the day I it needs to fired up again to do any additional work, which surprisingly serves enough as a barrier.