I think Jet could fall under a category (guerrilla). Even though he's self trained, he still uses certain stereotypical styles in his raids. A ranger could specialize in countering such groups.

Is there any way to keep a ranger's animal companion as an option, crunched in a different way? I'm thinking messenger hawk, or ostrich horse, or any of the mounts the fire nation uses. A shirshu, even, for a higher-level ranger.