I'm seconding (thirding? fourthing?) replacing those two pieces, but also I do recommend about turning down the amps for your constant daily use. Those original UMCs could get pretty hot running at their maximum 40A, and for your daily use, it's usually not necessary to go that high. It's not just heat itself, but heat cycling that is hard on electronics. In other words, when it's not charging, that cord goes down to air temperature (X). Then, when it's being used, it heats all the way up to Y. So every day, it's going through a temperature change between X and Y. Metals and solder joints expand and contract with changes in heat, so the farther that temperature difference is every single day/night cycle, that's just more cumulative physical stress on the parts. So if you can turn down the amps to something like 31 to 34 amps or so instead of 40, then you can keep that temperature change between "cold" to "slightly warm" instead of "cold" to "hot". That should help the lifetime of your charging cable.