Reform the system from the ground up.
And for the "full federal employee" thing? Government-backed pension, healthcare, education credits for family, pay, all sorts of fun shit. Including the peace officers. I always believe in a carrot and stick process. The stick being the points 1-7 above where the idea of a "cop" is redefined as someone that is trying to mitigate disputes and keep the peace. Versus the stormtrooper shit we've got going now, with them being corrupt, incompetent, and unpredictable. So we offer the carrot. Incentivize people to do the right thing and discourage doing the wrong thing. It's not complicated.
But this is of course a fantasy. Too many conservative fuckknobs fellating the police. Had the riots that were instigated in MN strictly because of the unchecked bullshit the police get away with and every fuckknob conservative in my workplace was regurgitating the Fox News bullshit they heard. So of course they were mocking the calls for reform.