No to Enel, yes to the other 2. Enel is done, not nearly popular enough for Oda to stuff into what's remaining in the story, his moon adventures look pretty filler. Enel had no relevance in One Piece world politics to begin with unlike other past villains (Moriah, Doflamingo, Lucci, Crocodile).