Well, what I thought was a top-end (lifter) noise turned out to be a bottom end knock, most noticeable when its cold. Time to start saving up for a rebuild and tune:(
