My main concern for the remaining episodes is that they have very little time to resolve the Effy and Naomily story lines satisfactorily and with my hoped for happyish endings.

Yeah, that's my main concern as well, and that's why I've been so annoyed that Naomi's not getting her own episode. Hopefully she'll have enough screentime in the finale to do her storyline justice. I think it's good that Effy still has her whole episode left to hopefully resolve her storyline but it'll probably be a bit rushed.