After reading all the cards very carefully, I called today to revise my order slightly.
I'm now getting 3 starters, 1 X-Wing, 1 TIE, 2 Y-Wing, 2 TIE Advanced
That will be:
4 X-Wing (same as before)
7 TIE (one more than before)
2 Y-Wing (same as before)
2 TIE Advanced (same as before)
If the R5 (from the X-Wing expansion) ends up being very good, I will order another X-Wing Expansion. Though with only 6 rebel ships and 7 astromechs to chose from (not counting doubles of uniques), I'm hoping I'll be all set.
This will hopefully give me lots of options until the next expansions are released. And, this way I got one more TIE for only $5 more (plus more Dice, templates, tokens, etc.)