Yes.
My proposed adjustments: Computer cost is only for quantum and other advanced computers. Basic nav computers will not be counted, since every ship has to have one. Also, subspace and radio communications should not be counted, since all ships have them that they're cheap.
Fighters, shuttles, and power armors can me produced in batches of ten (where the cost would otherwise be calculated normally), reducing their cost per individual armor.