personally i would ditch the Angels and go for a shoal of about 50 Tiger Barbs (mixed with Green Tigers).
I would have thought Tigers will be fine in a large number, becuase they will only be aggressive to their species, but that is a guess based on the stocking of my (slightly smaller) 180L tank