Mine had been making a tap/rattle initially on startup for a bit and I had thought it was the tappets, again, this went away after a couple of mins, though now it looks my chain is on its way out - so this noise could be directly related (although I never had any of your other symptoms), so I would get it checked as you could defo do without it snappping!
Vocky, the tensioner comes in the timing chain kit doesnt it?