Surrogacy law overhaul could end parents having to adopt their own children