Personally I just say "electronic music" as the generic term to reference any/all sub-genres. Anything more specific falls apart quickly - even the "d" in edm implies danceability, which neglects several sub-genres.