I have had both community tanks and also Orandas- and would have to say- the Orandas- they come in lots of colors, basically docile towards each other, and grow big. .. Since you have a diamond type shape which is tall- may I suggest also angels.. They are more divers than side to side swimmers.