I would stay with Comp Cams, They have a "Hot Line" to call and will make recommendations for your application. Also, may want to consider the rocker arm upgrade kit (needle bearings).

As for the pump, I would replace it. The pump may be OK, but the pressure... Login to read more.