Thanks for comments folks,
I drove 20miles today, as soon as I got back sprayed contact cleaner on all sensors then disconnected the MAF.
Outcome: slightly faster restart time (4 seconds compared to 6).
Then reconnected MAF, disconnected the camshaft sensor, popped in the freezer till really...