Mark, if you end up fixing this one, I suggest you check camshaft end play; many of these motors needed thrust washers installed to limit end play, and end play past a certain spec mandated cylinder head replacement.

GM published TSB's for this concern; I do... Login to read more.