I would at lease replace the B2 bore seal-The round plate with the two orange dots on the plate...the black seal, and swap out the metal sleeve for the plastic one...

How to Replace Your Oil Cooler Lines

Martin