I'm really not clear on what you want to do from here exactly. What are you shooting for? Are the current options unsatisfactory such that you can't express something? If so, what is it?
Are they broken for not being based around puberty? If so, that wasn't the intent with them to begin with - puberty's just one arbitrary thing, but not necessarily the most useful thing.
My understanding was that the previous options appeared to map around a period of several years going by their description, and they no longer do that by consequence of changing the teenager description.
We don't have an age category for characters experiencing puberty, but that isn't exactly a problem because that isn't the intent with them. Puberty is an extremely un-neat biolgoical process that has only a loose relationship to age: it can start as early as 8 years old, and precocious puberty is a medical term for puberty that starts even earlier.
I've considered suggesting that we rename "teenager" to "adolescent", which is more agnostic for those characters who don't experience adolescence as teenage years.
Please do try to make your point clear because I'm not sure I follow it.