I wold take a look at North American Rescue Products if you haven't already. I'm a Medic in the U.S. Army and we're begining to use more and more of their products. They've got a lot of great products and are coming out with more all the time. They also have a lot of kits already set up for SWAT teams.
www.NARescue.com
Good Luck