FINS will produce the stroke improvements you're looking for. MC S&T will build endurance, but not so much technique. There are cost and commuting differences between the two, but given what you're looking for I'd strongly recommend FINS. (My kids have done both, and had instructors I respected at both.)