I would go with supervisor training being required for a police/ems unit and not a specific unit. With fire the unit itself serves a purpose whereas in the other disciplines a supervisor can be on a normal unit and accomplish the same things. I would also just call it "Supervisor" and not specify ranks.
I think SGT can work accross pretty much every police force, however I'd agree that as a generic term, it would work well.