Switch to solid lifters with oem cam?

Are you sure you have correct proper preload on the hydraulic lifters? If not your pushrods are not the correct length.