Yeah, that's what I was intending to do but I also wanted to double (and triple) check I was looking at the right hoses.
Should I just disconnect the poly section from below the engine and run new stuff from the metal tubing? What do I do with the tubes still attached to the side of the engine bay? Just coil them up tie them out of the way?