Well the wiring looks ok and I've changed all sensors except crank sensor. Spare ECU will be here this week, so I'll give it a go and see what happens. With hindsight I should have driven straight back and let them sort this out. Seem to be a bit temp related too as the problem gets worse as it gets hotter although the tickover is pants whatever.