Californias having Marital problems

Yeah, part of this was my fault. Here's the scoop:

One pair of cals and one pair of gambels each have a 2 foot by 4 foot pen. They are scared as hell of me and pace constantly. I thought they would be happier in a bigger pen so I put both pairs in a 3 foot by 10 foot pen. They seemed to really like it for a couple days. Then the Cal rooster turned on his hean and started beating the can off her. I took him out, and Gambel's hen started beating the can off her. Now nobody likes her. I put them back in thier original small cages. The gambels are fine but the cal roo still wants to hurt is hen. I waited a day and put her back with him, and he was fine for a half hour then started beating her again. He ripped open the back of her head. I have both separated into thier own pen. All the pens have been given privacey dividers as well. I had a coturnix rooster who was beating up EVERYBODY but I didn't want to kill him yet because he's only 4.5 weeks old so I put him in with the cal rooster. They get alone like peaches and cream, which surprised me. I thought that if either of them got the can beat off them it might teach them a lesson :twisted: but there's no fighting. Meanwhile, what do I do about the pair of Cals. Will they be able to go back together in a couple weeks, do you think? I had this happen before to a coturnix and a button when I put them in the presence (but not in the same cage) of other birds. Took them a while but they're fine now, they get along great like they used to.

Thanks!
Jess