Dude, it makes sense Enel being back at Wano:
- The gods were introduced in Skypiea
- On Noland's flashback we have the citation of all gods, including the god of the sun
- Shimizu said that Kaido won't be the last villain from Wano arc
- Luffy coincidently can grab thunders in his "god form"
Well, actually those "coincidences" are pretty strange