It's armor. No two ways about it. You can't balance a game where enemies have two CC immunities you need to drill down to CC anything. This means a straight murder group all phys is the clear winner on every encounter.
I'm not even sure consolidating the two walls is going to fix anything. Maybe consolidate the physical and magical armor armor into a willpower meter. When the meter is drained you become more susceptible to CC. But CC should work at full willpower, too. I would say rolls against willpower should get better when the enemy has 0 willpower remaining. All attacks would get a willpower damage number with magic attacks possibly being higher damage to willpower.
This way armor could return to a physical damage reducer and shields block again.
Then the game is much closer to the original and far less build prohibiting.