G'day Rob,
My opinion, without pictures of your fitment issues, is that the problem is not with your water pumps but rather with your radiator.
Read
Mystery Radiator , this may help you out.
There are however different ( and therefore incorrect ) waterpumps, but they will only fit earlier or later motors, so I'n pretty sure that this won't be the problem.
Hope this helps.
Pedr