Board layout done, sent to OSHPark for fabrication! Will presumably find out whether it's actually correct at some point when they arrive.
Fixed stupid error in board involving the wrong wiring for the servos, also changed the layout to use screw terminals rather than on board switches, this allows for panel mount (and higher current) switches and means the board itself can be tucked away somewhere.