Had my d2 apart over the weekend to replace the fuel pump. And found exactly what you found muppet. Like you, a good clean and some sikka....job done!!
And now im back on the move courtesy of a fuel pump that works. Happy days!!
Cheers Goose