If kompany can find some resolution to his constant injuries then him without a shadow of doubt!
If that's not possible I'd stick with Otamendi. Yes he has his faults, that he really needs to sort out but On the whole I think he'll suit our needs better. He is 28 and when it looks like we might be bringing in 2 x young defenders in stones and Laporte as well as denayer returning I think Otamendis experience will be needed as pose to Managala who I think still needs guidance himself!
Otamendi tries to take responsibility, if you watch him, he is the one doing lots of the organsing in kompanys absence!