aakaakaak has a good point.
As far as fish that can go with angelfish...larger tetras (2"+) go well with angels. If you are wanting a breeding pair, I would stay away from the smaller tetras, like neons, or any smaller fish, like harlequin rasbora.
Random announcement...I found Amun, my halfmoon betta boy, this morning. He's still alive, but he's not looking so hot.