Jack,
It sounds like the water pump's impeller is loose on the shaft.
But - first check your ignition timing from idle to 4000 rpm.
The electric water pump we used very successfully is from
Davies-Craig but I'm also looking at the
Stewart Components piece which may be easier to retrofit.