Have you tried bleeding it ?, drained the water off the fuel housing drain point ?
Just leave the piston out of the stop solenoid for now just to discount it.
Does it have a bleed plunger ?, is the diapragm in it ok ?
tabetha