6x Zebra Danio and if you put them in the 10 gl with 6x barbs that's a very crowded tank. The danios might not have enough swimming room to avoid the barbs if they decide to start nipping at them. If keeping the angels are what you want to focus on maybe the barbs & danios need to be exchanged for something else that will live peacefully with your angels.
If it were me (and it's not) I'd exchange the barbs & danios and get a herd of loaches (not clowns, a 55 won't be large enough for them in the long run).
I'd get 5 to 7 of either b. straita, b. almorhae or b. kubotai.