As for Amy i didn't have a problem with 7 days punishment,after i completed punishment of her on last day there was H-scene
and after that you can catch her in Gym on certain day for addition scene(forgot the day).
Although she accepted to work for me using her to train others is locked until update.
Maybe try to go again for old save if you have it when you put her chastity panties on(and spy on her once during night after that)
or maybe try to simply load the game and forget about all other mission and do patrol,might catch her doing something that will trigger other stuff.
Wish i could help more.i have bunch of saves from my game which i dont mind sharing.
I just kinda randomly save stuff.Maybe in one of them you will find her final punishment,i deleted the game since i'm done but did save my saves but i'm not sure you will want that since I'm called Michael Shadow and i have no idea how to rename yourself to what you like.Really sry about that.I truly wish i could help.