Okay, the solenoid is under the right side over as posted. And you've renewed this? The starter relay, aka the headlight cut out is under the tank on the backbone. 5 pin relay, it can be matched at any big box auto parts store.
A positive attitude may not solve all your problems, but it will annoy enough people to make it worth the effort. Herm Albright (1876 - 1944)