At some point Fujiyama should see if the magical girl org can buy out her contract or something. Or put her in witness protection.
The evil general who's not so bad at heart and eventually turns coat is a staple of the genre, after all. There’s gotta be procedures in place for that sorta thing.