You can get starter assemblies at Barlows of Henbury, and a place in Finland manufatures wiring harnesses. Oy Moto-check AB, moto.check@multi.fi
Originally with mine, in much the same state as yours, I isolated the ignition switch from the rest of the harness, then used to cross the solenoid to...