I only collect the gimmicks, and only one of each element. But here are my guesses for Trap Masters.
Wave 4: Thunderbolt, Short Cut, and Knight Light.
Wave 5: Enigma and Knight Mare.
I highly doubt both the light and dark trap masters will be in the same wave. Keeps you hunting until the end if they separate them, ya know. But that's my guess.