1987 Jimmy gas tank/fuel system replacement

[Element]

Want to get the gas tank and fuel pump/sending unit swapped out on the Blazer (1987 TBI350), since the sending unit and pump are stock parts, the tank is belching rust and sediment, and I believe the baffle's broken and is flopping around.

Going to order everything from RockAuto, but I want to make sure I get all the parts I need. I know gas tank, fuel pump, and sending unit. The pump says I'll also need a new strainer and wiring harness (pump is AC Delco P/N EP386). I'm assuming a generic wiring harness (think they only list an Airtex and Carter) will fit the Delco pump fine? Also, should I reuse the stock straps (they actually look fine, and I have a feeling they were replaced not too long before I bought the truck)?

I'll pretty much be replacing the entire fuel tank assembly, so are there any small things besides the tank, pump, sending unit, pump wiring harness, and strainer that I need to order?

 

[4X4HIGH]

Buy new isolator pads for the straps. They sometimes don't want to come off the tank to get used over again.

 

[rocknutah]

The harness is there.

Just pulled a 25168719 (AC #EP386) off the shelf, the pigtail harness comes with the pump. The part # on the strainer is 25055460 (AC #TS6). As for the strap to tank insulators, some good tar paper cut to fit works great.