Well, on my 07 Iron, before I removed the ES entirely, I had a + lead that came from the ES button and a 2nd ground lead that came from the Natural/Clutch switch. I needed both the ground and battery supplied to get the solenoid to energize.
So my solenoid had 4 wires. 2 fatty ones that attached to the relay contact lead and 2 small ones that attached to the relay coil and energized the thing. Some solenoids only have a + control input and get the grounding from the case/chassis. I would suggest one of these and get rid of all that interlock stuff.. Of course you have to be more careful about hitting the start then..
If I am wrong about this I apologize, as I am going on memory.