There's a problem with the logistics. I am pretty sure the commercial implied that the romance begins next episode. Next episode, Kinetic will still having "possession" of the pool, not Arrow. The only way this works is if a.) they misinformed us about when the romance starts or b.) the romance starts in some other fashion next episode, but the scene by the pool is from some later point in it another episode or two onwards.
Of course the teams could be redistributed at just about any point in this show. Going based on who's on each team now doesn't necessarily work.
And actually from the one second we saw, I kind of thought the woman might have been Heidi. And she's the one person who's definitely going to stay on Kinetic if they redistribute people any time in the next episode or two.