Dear there is a quote from Economics " U can't eat the cake & have it too".
So u can either apply ASAP to get in the queue and avoid the immg policy change or do the necessary changes in baby passport for surname,which of course would consume some time,which u would definitely don't want to do...