Suzuki GS500E 96 Starter Solenoid problem

[boggy]

Hi
while travelling to work today it (in the raining as usual),I got about 100yards down the road when my bike lost power and stopped all the electrics went dead, looks like the main fuse had blown, after pushing it back home I checked the fuse and found it was OK but the connections had corroded I cleaned them up
the best I could and coated them in WD40 and I now have it running again. but for how long and when will it happen again. I am now on the look out for a replacement starter solenoid but not having much luck, does anybody know if there is a solenoid from another model that will do the job.