Armisael

If you really want to keep Keldorn in your party, put him in charge and he shouldn't fight with Viconia. Viconia may or may not be a bitch, but she's the best cleric in the game.