Don't forget about the upgrade options for both S1 and S2 owners.
There is an official statement from bitmain about these upgrades?
Read the product sales info under the S2 kit on the Bitmain website.. It clearly says they will keep their S2 product line upgradable .