If you're going for the 6S, only the 2nd linked motor is appropriate. Seems you'd be right about perfect on thrust with a 12" prop.
Not sure about the 650 to 680 swap. You'd have to check the length of the booms on both to see if it would save money over just buying the whole 680 kit...