In between all the jokes I think we've covered most of the possibilities between us, if it comes back it will be a case of eliminating them one by one
Drove it to work today and its fine, looks like it was just a lifter being overly noisy due to low oil. I also have a proper stethoscope style thing for listening to engine parts. I'll do a pic