So I managed to put all the electronics together without having to add a channel - yeah.
The soldering is done, pickguard screwed on, strings put on and rough tuned, string trees added. Now just let it all settle for a few days and then I can do the setup.