I've been at the wrong side of a pepper spray (don't worry, I was with the "good guys"). I'd suggest adding some physical skills as back up . Things do not always work like in the commercials.
I personally know a guy who rushed a cop while being tased and maced. It didn't slow him down all that much. In fact what put a stop to him was the 3 other cops hitting tackling him and using a nightstick as leverage against the back of his skull.