Well the beauty of Sparktober is we can have both and not choose.

I prefer to believe Teyla figured out the thing between them before either of them admitted it even to themselves. Because she's Teyla and she's a badass who knows everything.

And then later she strategically happened to be in the right place at the right time to spot John. Because leverage can always be useful. Just in case. ;)