The run on I assume is a fault of the switch, the cut off not being activated. Study the ignition switch circuit.
The lights?????????
Do you still have the same problems you started with?

 

Well I sorted out my brake light problem. Bulbs were in the sockets at a 90° orientation to the supposed location. Keeping the bulb constantly in contact with the two contact points. I havebt encountered the run on again but I did have the battery and RCM out so maybe a connection was loose. As soon as I looked at the socket with a light i knew it was in wrong. I'll post back if the run on occurs again.