Well, if electricity isn't a concern for you, go for the most cost effective hash rate in terms of HS/price, that way you'll be able to scale more and have more profits. s7 seems like a good deal in this case.
Yes this is exactly what I'm thinking hash/price, the S7 wins hands down.
Wish I could find good s7 miners for under 600 tho.