You know Aidan would keep a keen and stubborn eye on Mal for as long as he has the energy to. Talking to Oli, it sounds like he might grow up to be the prison AA sponsor so if you'd like to play with that I'm up for it!
I have no one to volunteer for Martha except Wade, but he's there if you want him.