The friendliest place on the web for anyone with an interest in aquariums or fish keeping!
If you have answers, please help by responding to the unanswered posts.
If you need to chose between the two I would go with any fish other than the parrot. If you want a peaceful cichlid, the keyhole cichlid would work. How big is your tank?