Much of the cost in per unit is due to initial capex (e.g. R&D and tooling). I would hope they're reusing many of the things from the first version. This would make the new version much cheaper per unit.
But agreed that cost is likely to balloon, both government and defense contractors are incentivized for it to balloon (it's a lucrative jobs program for many across many states).