I think the best solution to the retrofit series problem (and it is a problem) would be to go back to the SEIII build queue system, where there is no real difference between building and repairing.
I ought to dig out SEIII one of these days, just for a laugh.