Those changes would definitely be for the better. I get why the TC boni are necessary balance-wise (as the IC boni are a hidden TC bonus, too), but they look ugly and are hard to justify fluff-wise; I'd prefer to address the problem at the root: Changing the bonus from IC +x% to Industrial Efficiency Total +x% should give them the pure production/supply boni (unless I'm mistaken about what IC value the TC is calculated from).