I've ended up splitting the difference with my desktop and my surface go. The surface go is portable and easy to bring around, the desktop has the power, if I need it on the surface I just remote in to the desktop. My laptop (a Dell XPS), basically now only exists for flights/abroad trips where I might need more power than the surface go but reliable connectivity is not guaranteed. Which means it hasn't been used this year
Yeah this was an option I was considering as well - surface line is really good as well - but I would prefer a Ryzen machine if I went for a Windows device, they seemed to have nailed power efficiency in the 4 series and 5 should improve on that.