I agree with this split. I would add Jubilee, Bishop and Sunspot to Storm’s team. And maybe Archangel, Psylocke, Emma and Iceman to Cyclopse’s.
I just hope this season builds up to Onslaught but does not rush it. I have a fear they could try and cram this in the last two’s episodes. I hope not.