I thought smithing might fall under Art - Metal-shop, unless that just focuses on crafty things. I'd wager Combat could have multiple learning paths like Art and Science, etc. only they'd be something like various fighting styles, with or without weaponry.

In any case, I've thought about making a sixth-year character, since I don't recall seeing one yet.