you got an oil pressure guage? oil light is worrying, if the head is being starved of oil then it will tap.