My suggestion is you go to this site and buy a Racor with the water seperator. I read your posts as this is the original. You do not want the original in your system. Cut it out and replace and while you are at it- replace the fuel line from the tank to the engine. That is probebly the original also and it time for that to go also. also when you order the filter unit, order a couple of spare 10 micron spin-on filters. They are on sale and even with shipping beats the West Marine price at the no-sales tax store in Delaware that I use.
Do it and good luck
Ian
s/v Meant to Be