I think I've finished the power supply... haven't switched on yet as I want to look it over again with fresh eyes and make sure I haven't done anything dumb! Here she is:

Power in top right via the D curve mcb which will be din mounted and dc out from the lower terminal block. I have wired a 10k resistor between the dc terminals to drain the caps once powered. Any comments before I turn it on?!