That'll teach me for posting when i'm tired :-p
Brain said 1610, fingers typed 1605.

Ok - i'll go SB20 all round for simplicity sake.

24V will be upgraded - but it means upgrading the stepper driver boards as well...so it won't happen immediately, but as soon as its possible.