I believe your tank is full as it is (well if you add more to the schools). Angels would work with the fish you have (except maybe the Betta), but you don't have room.
Cherry barbs are not nippy IME and are actually good fish to keep with Angels.
I would add a couple more Cherries, a couple more Harlequins, and a couple more cories of each type.