I like option 2 I want to see what the surprise is?. As for Martha, I think it would be cute if her and Tiphany ended up regressed together if she loves diapers so much?
I would like for them to be a father and son relationship. However, you have been doing so well with this story that I feel like I would enjoy which ever relationship type you have planned.