Angelfish

I've never had angelfish but I think that 2 females would be OK, and 2 males might be OK. I realise that is not very helpful 

I've only had dwarf cichlids and with those 2 males were OK together in the absence of something to fight over, ie females. Someone with experience of angels would be more help.

I started with two females and there is a general level of competition between them. Its not all one way, they seem to take it in turns. No damage has ever been done but they do make contact at times, a head-butt to the chest is a bad as it gets as they chase each other around especially when egg laying.
When I realised they were both female I got a second pair (no idea what sex they are yet) with the thought that it would settle them down. I think it has but now it is one of the new pair, half the size of the originals that chases the others!
There is still no real aggression and never damage and so I have come to the conclusion that its just a part of angelfish society and let them get on with it.