On this next motor you could try and help the oil flow a little better.

The 97-03 timing cover has a very poor casting that limits oil flow, the 04+ is a better design, you can also do the 04+ oil pressure spring to bump it up a few lbs. Its just a thought.