Do you envision the conflict as being between Elizabeth/Teyla and John or as between John and Elizabeth with Teyla being more neutral or as between John and Teyla with Elizabeth being more neutral or as between Teyla and Elizabeth with John being more neutral?

I think last night's ep definitely had Ronon/Teyla subtext but the Elizabeth/Teyla was there in spades. And you missed the scene in the previous episode where Teyla is so so glad that Elizabeth is alive that you could see her smile from eight galaxies over. Wonderful moment.