I think I would definitely put more effort into establishing clearer space/time boundaries between work and home. I live near a local library and might turn it into an office of sorts so that I have a place to go, people to interact with and so on.
I'd definitely put more effort into making sure I'd wake up, shower, and dress for work during work hours and then stop at the end of the work day.
I used to go out in the morning to a local Starbucks and do email and planning tasks plus also get some social interaction. That worked really well for staring the day with a clear boundary.
At the end of the day I'd walk up to the train station (through a park) to meet my wife, so I'd have a clear boundary on both ends of my day. It worked really well while I lived there. Now I'm in a small town and it's a bit harder to do something similar.
I do this. I work from home mostly as my companies office is an 8 hour flight away. I have a standup first thing in the morning and try get a bike ride or gym session in at the end of the day. I also have a table in an office that is a 40 minute bike ride away however I feel better and more productive when I work from home with this schedule.
I'd definitely put more effort into making sure I'd wake up, shower, and dress for work during work hours and then stop at the end of the work day.
Basically, better discipline, more delineation.