This seems to me to be a ridiculously complex job due to the OP's inability to actually diagnose the problems
No arguments from me.
The diodes in place look to be working but there are stories here and on other sites of them giving out on initial power up. I'm not in a rush to replace parts I don't have to. I'll get the caps installed, stick a light bulb in series with the mains and see what I get.