Alright I got everything fixed up, going with a couple of fixes I checked over with grey, and finally deciding to opt for the geass despite how restrictive it may be, seeing as, how grey stated himself, Amon is a death row inmate anyways, so it may be a harsh resort, but she's certainly capable of deserving it.
It doesn't need to be deactivated since it's a short term one anyways, the conditions of it specifically stated to be related to her time as a student.