It really depends on how they revamped it's skill set. But based on the Gen V set, I'd evolve it at 22.
Pokemon-Amie
http://www.serebii.net/xy/pokemonamie.shtml ? Weird...
my torchic is several levels ahead of my froakiehow did this happenalso im calling them that but theyre both in their second evolutionstoo lazy to remember how to spell themim playing this as soon again as i wake up in six hours
Starter Obtained (Fenniken)Fletchling Caught (Forest 1)Squirtle Obtained (Second Starter)Torchick obtained (Mystery Gift)Torchick Evolved (Route 5 , Combusken)Fenniken Evolved (Route 5 , Braixen)Machop Caught (Glittering Cave)Onix Caught (Glittering Cave)Squirtle Evolved (Route 10 , Wartortle)Fletchling Evolved (Route 10 , Fletchinder )It's all in order.
Edited.