Not sure if this has even been brought up but instead of these dumb ass 1a and 1b waves why not base it on prestige? So prestige 13 players are in wave 1a, 1b is prestige 12 and so on. It would create a more competitive game balance during wars.
Now if you were a p11 and wanted to stay with a p13 faction you could but once you choose to move up you are stuck. The tricky part is if you move up prestige. I would suggest you get 30 days to find a new home in any of the regions of your new or higher prestige while getting a free (scopely doesnt know this word) key.
Just my brain thinking. Keep on surviving.