I'm pretty sure they are the correct ones.
I'll double check the oil pump drive gear. I don't think my engine builder balanced the crank.
I've already taken off the intake, when I get it back together and if there's still a noise I will remove the belts to eliminate that possibility.