Good to know your well on your way to sorting out the problems and then enjoy the car.
Regarding the plugs maybe someone has a secondhand engine harness, this should have all those plugs, just a thought.