Yeah, this. Naomi's self-discovery was so beautifully done last series, and I feel like the retcon was intended as fanservice - their love is even more epic! - but instead it just ruins what people liked about them in the first place.