To me, it sounds as if you made the right choice in leaving, no question about it. I know, when you're in that situation, it's easy to second guess yourself, but I don't think things would have got much better, and, even if they did, it's not worth the gamble.