I have a mk3 starter in my golf. I had the same problem with the solenoid as well. Ended up using the solenoid off the original starter motor, but I've found a solenoid from an Audi starter motor with the 2 spade terminals.
Hope this sheds some light