Productive weekend.
Spoiler is at the bodyshop, shocks have been replaced (one was leaking badly), standard airbox fitted, centre of steering wheel has been sprayed with black plastidip, and the CEL problem is cured.
This is the old knock sensor, would explain why is was causing problems....