BBM, even though you hate crimp connectors, consider yourself lucky, it could have been worse. Imagine the mess if the previous owner had tried the repairs with a pistol style soldering gun, used acid core solder or got the wires too hot, melted the wire insulation or connector housings, etc. Glad you found the mess and can fix it.

Mike