I’m 99.9% sure the gear timing isn’t wrong
I replaced the shim for the pump as it came and it had never been apart but it had sat for years in a boat in fact the shim never left the block , it was stuck so I left it
If I got a couple of shims would it be ok to add them one at a time to see if it helps?