Hi,
that is an improvement. Well done.
Is it safe? It depends on climatical influence, dirt, the voltages and the usage. And for sure the safte regulation of your country.
If you turn C1 90°, then you could make GND plane smaller and thus the distance to mains voltage wider. Also you could shift the 45° mains traces a bit to the left.
Mind: You don´t need that much distance between mains and mains. But you need more distance between mains and SELV for safety reasons.
The mains traces at the edge of the PCB is not nice, but if you put then PCB in a plastic box it should be OK.
Check if it is possible to change the 1N400x into 1N4148, they are much faster.
Can someone post the EMC/EMI rules?
At least in Germany this is very expensive. Buy a hundred sheets of paper and pay some hundreds of €.
Copying and sending is not allowed - at least in Germany, but i think in other countries also.
EMI/EMC rules depend on country.
****
Besides the EMI/EMC rules there are the safety rules. This is a more huge document and even more expensive. And it is hard to read and to understand...
Klaus