If the tank is big enough you can eliminate fighting, because everyone knows their place , its when the conditions get crowded that problems start. Was that a pond or a tank AikidoGuy? What are your tank specs now?
Angels are really pretty peaceful , I keep mine with candy cane tetras ,agassizii corys, platys, clown pleco. All are doing great, angels are ciclids but not all that aggressive - although I did have one that I gave away as he was a stinker. I have 5 angels in the tank ( 90 gallon) they stay pretty much to their own but I am watching them closely so far so good.