Small update: I found a better chip for the pre-regulator - the
LTC3824. It can also go up to 100% duty cycle, uses an external P-channel MOSFET which means there's more headroom for the linear regulator as the LM2596 will drop roughly 2V at full current with the switch permanently on while the MOSFET will drop a lot less, depending on the actual part used, but overall I'll end up with increased efficiency.
Two more nice features are the higher input voltage and current limit set resistor which means that now I can build other bench PSUs with different specs based on the same schematic

. Maybe I'll need a small linear pre-regulator for the LM317 for higher input voltages... details, details.
I might have reached my goal of designing an easily scalable PSU.
