WHEW!! I bout broke my neck getting back to boileroom to post this. I would NOT remove or add ANY fish for next two weeks. You should really post exact readings for ammonia, nitrites and nitrates. This will help us know exactly where your tank is at in maturing process. You will need a liqid test kit such as API freshwater master kit. The test strips do not give accurate readings. In previous post I suggested removing swordtails and adding tetras .This would be AFTER tank has matured. :)
The most important medication in your fish medicine cabinet is.. Clean water.