That looks pretty good. I am not confident enough to put the power to things when thay are spread out like that. Waaayyyyy to paranoid. Reasonable analysis does show that it is safer and easier to troubleshoot...but that does not mean too much when it's my finger on the variac knob.
cheers,
Douglas