Wikipedia and RYM seems to split this genre in 2 and another site in 3 (see links below).

I would like simply “trap” as a tag but if you feel a rap flavor and an EDM flavor needs to be added go for “trap rap” (or “trap music (hip hop)”) and “trap music” (or “trap music (EDM)”).

I prefer just “trap” myself since it could be used with another tag like edm or hip hop in conjunction.

https://en.wikipedia.org/wiki/Trap_music

https://rateyourmusic.com/genre/Trap+Rap/

https://en.wikipedia.org/wiki/Trap_music_(EDM)

https://rateyourmusic.com/genre/Trap+%5bEDM%5d/

https://runthetrap.com/what-is-trap-music/