Welcome to the forum, Chris
Julie gave you some great info, and I have to agree with her. Angelfish get very deep bodies and need at least a 30g, in my opinion. The serpaes are likely to get very aggressive with so many tank mates in such a small tank.
Congrats on the swordtail