Amy can't have children after "a good man goes to war" because they fucked around with her lady junk to much to make River like that.
I doubt that to because it doesn't really make sense with the timeline. Rory and Amelia were born in about the 80s, and they end up in the 30s. If you attempt to place Rory's father in that time line, in order for him to realistically have children, Rory and Amy would need to have children up to a decade later at least, in the 40s. Even then he father's Rory in his 40s.
Considering how both would have to have extremely late births just for the math to add up, and they can't even have children as far as we know, it doesn't seem like a valid theory.
Edit: Im liking the theory of the master as a female regeneration posing as a companion :naughty: