I am moving a 36"x18"x18" tank upstairs once some fish we sold are picked up from here. Once it has been moved there will only be a breeding pair of angels, a 15cm pleco and a 6cm BN. I am planning on keeping a pair of 5cm swordtails, some black widows and some head and tail light tetras in with them while upstairs. The tank has a 1000lph internal filter. WOuld these fish go with the angels and plecos? The angels have been kept with small fish including neons in the past month or 2.