Grinding, " diesel " noise under valve covers

So the plan is (let me know if I need to modify, add procedures, etc
I'm gonna warm er up, listen, then dump the oil ( don't have many miles on it, but it's darn dirty
Cut the oil filter, change oil, run it, remove fuel pump, run it and listen.
Then reinstall, and monitor. Probably need a new pump anyways. Then, at what point do I check other items..?