The underlying problem - which I've seen many of the comms (youtube or posts) speak to, is the lack of variety, identity, meaningful choices and so on. You've taken a step in the right direction by trying to address that through clear armor identity. Why dont we do the same for CP?
If you make CP choices more impactful (stronger, or more unique than just % increases), but then force us to choose between offensive and defensive ones, you will see a significant positive change in the meta (Read: It wont be so tight with very narrow build/gear/class choices). You wouldn't be able to pick a ton mitigation, sustain, and damage - ever - at the same time.
I think you're inevitably going to get there... but this seems a better time for it. Rather than inching there every year or so