Cherry or gold barbs are an option too. Black skirt tetras have a taller body so they will not be eaten. Also, the serpae and bleeding heart tetra. Most angels are ok with rummy nose, black tetras, or silver tip tetras. but, that depends on if you can get decently ones since your angels may well eat juveniles. Some angels are more predatory than others in communities.
I had celebes rainbows for awhile and they were great fun to watch.
Two roads diverged in a yellow wood, but thankfully they both led to fish stores.