Did the refixed roll get a bit clearer? See in the edges where it was all dark originally; it shouldn't look like that. It should like like the first or third strips do.
You'll still need to stop the enlarger lens down some more and probably get an ND filter for it, because you want to have enlarger exposures of 10s or more on a properly exposed negative. Adjustments in development time will not save you from too-short exposures in the enlarger. Your K100 negs look pretty nicely exposed.