In your place I would put in a call to the tech line at Comp Cams, explain what you outlined in the first post and see what they say. I would think that it shouldn't be too hard to find a tuner in the greater Albuquerque area that can tweak your OEM ECM a bit. Shouldn't need much, I wouldn't think. Are you going to refresh rings and bearings while you're at it, or just doing the cam & lifters at this point?