Honestly, combining both systems sounds pretty reasonable.

OS1's CC resists were pathetic, since they cease to exist as soon as you'd start pumping Int. I had to yell at my co-op buddy to stop using all of the Blind spells entirely, because they snap the game in half.

OS2's CC needs some improvements. From increasing their cooldowns and AP costs, to reducing chances from 100%, especially for non-Source spells. Armor prevents you from disabling all of the enemies on the first turn, yet it's not enough.
One example: Alexandar is kind of a badass, both lore-wise and in gameplay... but as soon as you strip him of his armor, he's done. He's never getting up or attacking you ever again. This shouldn't be a thing, especially for boss types.