Definitely fix all the fuel leaks first, Did you use the proper size and material o-rings on the fuel lines and change them all? Changing the delivery valve seals and shut off valve o-ring, fuel filters and the rubber line from the hard lines to the engine would help too. Get as much of it from the dealer as you can, trying to save a few dollars by not using quite the right part is basically installing an "unreliable beater" conversion kit.