Certainly one of your idle problems is the idle solenoid. Mine was plumbed up exactly as you have it now, I took it to my MOT man and he (being a knowledgeable chap) said that it was a warped carb base being a 1.7. I said it wasn't a warped carb base, have a look under the bonnet, which he did and straight away saw the idle solenoid with the filter the same as you have it.
Long story short, he pulled off the filter and put his hand half over the "inlet" to the ICV. The revs went from fluctuating (literally revving itself a bit) around 2000-2500 to a steady 850.
I can't find a good photo of it, but take a hose from the manifold under the throttle position sensor plug in the photo

to the ICV, then another from the ICV to the hose between the air filter and the throttle body (easy to do if you have the original Renault hose)
There are other things it could also be, but it will never be right without doing that.
Speed sensor. The one I use requires a regulated 12V, not 5V, but there may be differing sensors available. Mine didn't come from a Golf. The housing is identical, it just screws in as you have yours. No other mods to the dashboard were required, just 12V in, GND and signal out to the ECU.