I'm thinking that may be the best option, and the project may be creeping towards a custom PCB to mount everything neatly.

Unregulated 36V PSU bits, spindle power relay, and stepper drivers on one board with screw terminal headers would be nice and tidy..