You started to have a good point, but then lost it. You yourself said "EDM" = Club Music. Your list may be long, but as far as more credible, that is open to interpretation. One could very easily apply "EDM" retroactively as most if all of those genres and sub-genres contribute to what you call...