One thing though..its highly unlikely for a character to receive character development outside screentime. So the only possibility i see is that losing with luffy pushed him into character development..which is why i hope he comes back properly. He saw himself as god and hence by losing with luffy he should have out his feet on the ground now..a bit like bellamy..even though he likes dofla still..he respects luffys power and acknowledges him. I want that enel. One who is willing to get better and acknowledges the power of others.
It would be sooo cool if that happens! He already is a cool character, and if he stops viewing himself as a god and starts looking up to Luffy, mhe might end up becomming one of my favorite characters