James just out of interest do you know when the oil was last changed and what oil was used? From what i understand they are a little fussy about what grade oil to use.
Has it always had that tapping moise from the engine on tick over? TBH i could only just hear it when the bonnet was up so i dont think its serious.