Barbs love to grab at long tails and fins eg those on your angels. Angels love to eat small fish.
I would go for a dozen neons or cardinals. The will fill the middle of the water.
For the bottom what about 3 clown loaches - can grow quite big. Check against your tank size.
For the surface zebra danios can't be beaten. For what they lack in appearance the make up in action - never stationary
Grampa John