I know what you mean. Could this possibly be handled by a "save" option on the repair screen? I.e. make all your core changes, save then proceed. If one encountered a battle they didn't like (e.g. assault) one could load the saved game (the "completed" repair/expansion) and try again.