Argh! I hate aggression. Hopefully it will all settle down. The PBB screwed it all up. Kinda goes to show that sometimes the answer isn't always to just "add more polys." Sometimes there's just a jerk fish, and unless you have the right combo of others with it, it might have to live a solo life. Not many people have enough polys and tanks to figure all of that out.
Once everything settles from the poly shuffle scuffles are you going to try Kruger back in the big tank one more time to see what happens?