You just need a new quadrant, the clicking sound you here is beacause it's plastic and the teeth chew or brake off and so is slipping a few teeth.
They are about £5 new, but awkward to fit! lol
Mk6 pedal can be fitted but no need unless your running a AP Racing clutch.