While the engine is out (again), make sure the oil pan is solid. I had to replace mine last year just at the start of good fishing.
Once you get this last issue fixed, I promise that "you will not have any more problems for 2.7 years".
Wish you luck and I hope you don't make me a liar.
rkc