Thank you for pointing that out. By dumb luck, when trying to figure out my overheating problem, I did a new water pump which corresponded to the engine year, so I am good there. That is super helpful information for people like me with mix-and-match engines.