Preface: i am not a lawyer either and i welcome criticism as this is just an idea.
I think the solution wouldn't be to charge robbery twice as hard for cops, but to have an additional charge. Something like 'abuse of federal trusted power' or something like that which would carry its own penalties. This, i think, wouldn't cause the strict separation of penalties that could be problematic, but it would address the problem of people entrusted with federal power abusing it.