Ok, since it was none of the above answers (no clipping, all aligned), I'm just gonna repair it by hand. It's going to be a little rough, but at least I can move on. For reference, Top half is original map, Bottom has a few changes to make it look like it was supposed to.