It's interesting you say that I've recently started reading Dune, and one point that I found interesting was that the Butlerian Jihad was not a revolution where they swore of the machines who had become malicious against them but rather that some humans were using the machines to oppress other humans and that is what led to the Jihad. I find it interesting that all these technologies that are supposed to make our lives easier really just end up transferring power from one group of people to another.
So what I am saying is a Butlerian Jihad is always a solution.