RE: What would you do to stop your dogs from fighting
In the short term I'd do pretty much as you did - try to seprate them by whateer means possible. In the medium term I'd get them spayed or neutered if they aren't already.
But in the long term I'd got to a dog training school this will really help any dog to socialise with other dogs, and humans, and to learn how to find it's place in the pack that it happens to be in at any given time.
I have 2 dogs - both from a rescue centre who's package included 2 lessons with a dog trainer. I continued (it was fun as well) to complete a course of 10 lessons.