I'd take it back to where it seems good and a splice will be in a relatively straight run. I used to lean toward soldering the splices but for this situation I'd lean toward an open barrel crimp. That way it will have more flexibility.
Like Del shows here:Inline wiring splice clips........from the Dodge RAM service manual