"But I find that, inevitably, as a software developer, you are just going to be happier in a software company"

I'm the exact opposite. I find that working for a non-software company means: no bullshit standups and less stress because you aren't the profit center.