You have arrived at a satisfactory resolution of the problem,at least satisfactory to yourself
Trial and error has been your method and you are pleased with the outcome
After reading through this thread
I would advize anyone else who may have a similar faulty system to engage the services of a competent electrician to thoroughly test the system for safe continued use
A working system does not always equate with a safe working system
You have decided to self repair and dispense with critical testing for safe use,thats your own decision,but its not good advise, to return here giving warnings to unimformed people, who may not understand the difference between safe use and use
With faulty electrical systems the worst variety of potential dangers, is when the judgement by a non electrician that "it works" so it must be ok
Working and safe working are two sides of a very different animal