MSD look like a good option, just spent 2hrs looking over there guides.

Is the standard pump this bosch 044 that's mentioned on most sites??

looks like replacing the fuel pump loom should be done as a mater of course not just something to ponder, also the alternator feed to battery looks to be a positive move (no pun intended).