revisit the fuel gauge and sending unit issue

Have you considered just getting an OEM sending unit and being done with it?
Where?