I've decided to ditch the pump completely. There is enough gravity flow to supply my needs and have got a ram-air system to assist in keeping pressure above the fuel in the tank.
Another owner has suggested 1uf capacitor over the pump if I decided to keep it.
Thanks for the help, guys.