What are you using now?
Be carefull with tiger barbs around those angels.
They can be fin nippers. I had to move some green tiger barbs I have when they started taking chunks out of the tails of my dwarf gouramis.
I like the Marineland Emperor 400 if you are looking for a HOB