+1 on WS4 instead of WS1 and GMK
Regarding spacebars, you could keep the orange ones (basic alice support) in the base kit and all the white ones (full-on support) in the spacebar kit. Side note: personally, I would like to see the 1.75c spacebar kept in the spacebar kit (cuz I need it haha), so many sets don't have it nowadays