zFinn isn't what's broken, his kit works exactly as designed. C3PO is the problem, so if changes must be made, change him.
I know the typical counter is "but people invested real money into getting C3PO and Finn is a F2P character!" but that doesn't change the fact that Finn isn't broken and doesn't need changing.
If I buy a Corvette that for some reason doesn't brake correctly behind an old Ford truck, smashing the Ford's windows isn't going to actually fix the problem.