my 2.2 knocks when it starts

[Maxwedge]

Symptoms
when it starts and goes through its warm up rev up, it knocks bad!!!
then it goes away.
Then about 15 minutes(once its warm) later I can hear it again when I hit 2k.and the sound
stays.
To avoid the start up knock I would bump the motor with the starter a few times and that seemed to get rid of the knock during the start up.
So thinking it was the oil pump I changed the oil pump for a high flow unit.
just got it in this Saturday, Drove it around sunday, drove it around today. It's doin all the same things and WORSE. At idle, after its warm the oil light will blink on randomly...
I did prime the oil pump, but it still made an awful rod sound once I started it.
Help!!!!!!!
Maxwedge