I'de do angels or discus.. and increase the number to 3. Odd numbers disperse aggression. Discus need to be in groups or the least dominant fish often gets killed by the more dominant one. the general exception is if they pair up, and you can still see some aggression issues. If the Angels pair up they may decided to start killing tank-mates as well defineing a territory. but may be fine. I've seen both cases. Also avoid small species of tetras and other fish like neon tetras, guppies, ect.. Both the angels and discus can and will prey on them.
personally I'de go with a single Angel and build a nice community of schooling fish around it.