You need someone like the US Digital Service doing this with DHS. This gives you the force of federal law enforcement but the competence of skilled infosec practitioners on tours of duty short enough to enable high (“market rate”) comp but also results driven engagements. Bring back Chris Krebs, have this executed as part of CISA.