I think a common 1N4001 diode would work for both D1 and D2.
Note that the full rectified voltage of the power supply enters D2 and goes to the 12V voltage regulators. The upper limit of the voltage regulator is around 32v so there is a good possibility that the voltage being supplied is at the regulator's limit. To correct this I added a 12V 5w zener diode right after D2 to burn off 12V before it gets to the regulator. This brings the voltage into the 12V regulator well within its limits. You will still need a heat sink for the 12V regulator. The 5V regulator runs cool.
I initially used a 18V 5W zener but found it got quite hot and the 12V with heat sink was cool when using the fan. Using the 12V zener balanced it out a bit.
Note that the full rectified voltage of the power supply enters D2 and goes to the 12V voltage regulators. The upper limit of the voltage regulator is around 32v so there is a good possibility that the voltage being supplied is at the regulator's limit. To correct this I added a 12V 5w zener diode right after D2 to burn off 12V before it gets to the regulator. This brings the voltage into the 12V regulator well within its limits. You will still need a heat sink for the 12V regulator. The 5V regulator runs cool.
I initially used a 18V 5W zener but found it got quite hot and the 12V with heat sink was cool when using the fan. Using the 12V zener balanced it out a bit.