Sump baffle is engine out job, hardly worth it, just overfill by a litre on top of the high on dipstick.
Replace the water pump as part of 100,000km service which includes water pump, idler tensioners, cam belt - also good time to slap pair of adjustable cam gears while you're at it.
Should you want to go overboard, rebuild the motor.