Add new riot units and gear for LEO enforcement, maybe even for Vix.
Gear would include transparent riot shields (maybe use a system similar to current ballistic shield so they also use a baton), tear gas, heavier batons and current beanbag and 40 Mike Mike, but also rifles/pistols with rubber bullets or baton rounds. A vehicle with a mounted usable riot water cannon would also be cool. Uniforms should have riot vests and riot helmets.
Each department could have their own dedicated riot unit. For example: FCPD's Riot Control Team (RCT), JPD Community Resources for Public Order (CRPO), HCSO Public Disturbance Response (PDR), VHP Interstate Prostetors Clearance Force (IPCF), SBI Special Riot and Disturbance Taskforce (SRDT), and Vix Special Event Security and Crowd Control Detachment (SESCCD).