I've always thought it would be better for the Org to require a minimum age for baptism. Whatever age that you legally become an adult in whatever country you live in. It's a major adult decision & life long commitment.
Hopefully this will be one of the new changes coming down the pike.