If it was me I would pick either the HRPs or the FMs or the BAs.
For the HRPs and BAs get 1M3F. The FMs like to be in groups like tetras do, so get a even mix of them around eight.
Keep the Swordtails count up, even add a group of taller bodied tetras like black skirts, bleeding hearts etc.
The swords will go all over, the tetras should stay mid. Could even add a Bushy nose pleco, and a porthole cat for bottom.