I would be rehoming the Silver Dollars and going for a peaceful planted community tank.
I had Angel's and Neons together with no issues, I tend to get them when they're smaller then they grow up with each other and don't seem to both with each other when they're older.
Could go with: Angels. Swordtails, Platties, Serpae's, Black Widows, Glowlights, Scissortails, Penguins, Neon's plenty of choices if you go to a peacful setup.