first thing, cut out all the butt/crimp connectors and solder/marine heat shrink them or install waterproof harnesses. Those connectors do not keep water out and will eventually cause problems that will be a royal pain to sort out.
after that you can use the convoluted tubing like was factory but personally I like the look of techflex better. Be sure after cutting the end to melt it with a lighter so it does not unwrap.