So the manga ditched stretching in favor of an actual plot?

Nah, Stretching will return.

While Keiko's sexual orientation maybe questionable, this is not yuri.

NOT YURI!!!? shocking never expected that.