I just realized on the squad setup screen there are little green arrows on the left that you can use to shift squads rather than having to rebuild an entire squad for its starting position. Might save someone some annoyance in the future.