I don't think we're supposed to consider the one-shot to be on the same timeline as the series.

Exactly why not? So far as I can tell this series retcons the ending of the one shot but doesn't contradict it.

"Retcons the ending of the one shot". Are you sure ? Then TO WHAT fangirl is reacting like that ? http://dynasty-scans.com/chapters/strange_babies_ch01

And that suggests her NTR-like actions to be intentional, malicious (Informing Mado this chapter).