I think I know what it is mate, I had similar clicking sound before and it was even louder because I had the forge spacer fitted on, once I changed my diverter no more clicking sounds even with spacer on, I had a D before btw and bought a brand new diverter D and seems to have gone now, what diverter are you running?