Pheonix limited series has been announced. I heard nothing on continuity, though, so it may be set prior to her (latest) death.
I always thought Logan let himself be attracted to Jean because he couldn't let himself be attracted to his best friend's wife. Charles Xavier found him and offered a place to go where he could deal with his Heather issues.