Before the swap thing: I'll check oil cooler, water pump, then pull the pan and pressure check liners. If its liners I probably look at the swap.
Until then.........I'll harvest, drain pan every morning, and hope for the best.
Thanks, John