I wouldn't do they sorority tank unless you are doing that tank by itself. I tell people no less than five girls and enough hiding places to make the tank look very crowded. If you do that, it can be a very fun tank (betta girls are one of my favorites to keep).
As for the angel fish, I've...