Welp, so far the noise is loudest at the fuel pump, so maybe I will get lucky. Going to replace it and see where that gets me!

Thanks