infact, i'd get all them wires tidied up at the same time aswell - you're asking for trouble with them been like that

and also a new fuel rail will be nice - the 4x4 ones are best as the pressure regulator is bolted directly to the end of the rail unlike a 2wd one