As far as all of your issues, check out classic diesel designs. Stock, mild, or even wild rebuilds on the injectors and the injection pump. As far as the tanks, my opinion is if you don't want to upgrade to a larger rear tank, clean it up as best you can and see if it is clean enough to your...