The issues you will have ?
Angels need tall tanks and room. They grow fairly fast and adult angels have tall fins.
Min tank ? 29g, tho I recommend 55g as they can be grumpy.
Swords are very active swimmers. Is it a 20Long ? Or regular ?
They need side to side room and the males can hit 6". Same tank recommendations as Angels for me. 29g but 55g is better.
I applaud you wanting to upgrade your fish. But if a large tank isn't in the budget, consider rethinking your stocking plan.
http://aquariumtidings.com/swordtail-fish/