I'd say to check states -2 and -3 again.
[State -3, Super Cancel Check]
type = varset
trigger1 = (StateNo = [1000,2999]) && Time <= 2
var(7) = 1
ignorehitpause = 1
This was taken from a POTS styled character, but it may be different on Haggar. What I know is that var(7) is what detect the super cancel.
triggerall = StateNo != [1050,1053]
Something on these lines should work.